Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

kernel: update to 4.19.24 on s390x#361

Merged
grahamwhaley merged 2 commits into
kata-containers:masterfrom
tuan-hoang1:s390x-4.19.24
Mar 4, 2019
Merged

kernel: update to 4.19.24 on s390x#361
grahamwhaley merged 2 commits into
kata-containers:masterfrom
tuan-hoang1:s390x-4.19.24

Conversation

@tuan-hoang1
Copy link
Copy Markdown
Member

Add CONFIG_CFS_BANDWIDTH so CPU hotplug feature works on s390x. Note
that CPU hot-unplug does not work yet due to limitation in qemu s390x.

Remove CONFIG_USB_SUPPORT because s390x doesn't do USB.

Fixes #360

Signed-off-by: Tuan Hoang tmhoang@linux.vnet.ibm.com

Copy link
Copy Markdown

@devimc devimc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @tuan-hoang1

@jodh-intel
Copy link
Copy Markdown

Hi @tuan-hoang1 - thanks for raising. I think it would be helpful if you could split the commit into two separate ones: one for the USB removal and the other for the CFS_BANDWIDTH.

@tuan-hoang1
Copy link
Copy Markdown
Member Author

Updated, thanks @jodh-intel.

@jodh-intel
Copy link
Copy Markdown

Thanks @tuan-hoang1. Ideally that USB commit would mention USB in the commit title as the current "kernel: update to 4.19.24 on s390x" is a bit generic.

@tuan-hoang1
Copy link
Copy Markdown
Member Author

Thanks @jodh-intel, I updated it.

Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tuan-hoang1.

@jodh-intel
Copy link
Copy Markdown

Ping @kata-containers/packaging.

@devimc
Copy link
Copy Markdown

devimc commented Feb 26, 2019

/test

Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm
(/me notes 4.19.25 is out - I will PR a global update for that in a bit - it is a never ending chase :-) )

@grahamwhaley
Copy link
Copy Markdown
Contributor

that 18.04 CI fail looks odd - nothing to do with this PR afaict, but something strange happened in the jenkins script - I'll prod a re-run, but the output looks like:

Drop caches
/tmp/jenkins/workspace/kata-containers-packaging-ubuntu-16-04-PR/go/src/github.com/kata-containers/packaging
+ '[' -z '' ']'
+ specific_branch=
+ '[' -z 361 ']'
+ .ci/static-checks.sh github.com/kata-containers/packaging ''
+ command -v kata-runtime

I'm not sure that static-checks.sh invocation is quite right... let's see...

@tuan-hoang1
Copy link
Copy Markdown
Member Author

@grahamwhaley I guess you meant 16.04 CI. Yeah it does not relate to this PR.
Speaking of 4.19.25, I checked and there's no change from 4.19.24 on s390x.

@grahamwhaley
Copy link
Copy Markdown
Contributor

Hi @tuan-hoang1 - well, CI line in the status says jenkins-ci-ubuntu-18-04 :-) That was updated recently from 16.04. Sure, the s390x slave itself is probably still on 16.04, and that is not an issue. I just wanted to check if that 18.04 fail was spurious (even though I believe unrelated to this PR).
So, let's wait for that CI to complete again, and then merge this PR no matter I think.

Tuan Hoang added 2 commits March 4, 2019 13:34
Remove CONFIG_USB_SUPPORT because s390x doesn't do USB.

Fixes kata-containers#360

Signed-off-by: Tuan Hoang <tmhoang@linux.vnet.ibm.com>
Add CONFIG_CFS_BANDWIDTH so CPU hotplug feature works on s390x. Note
that CPU hot-unplug does not work yet due to limitations in qemu s390x.

Fixes kata-containers#360

Signed-off-by: Tuan Hoang <tmhoang@linux.vnet.ibm.com>
@tuan-hoang1
Copy link
Copy Markdown
Member Author

@grahamwhaley would you mind mergin this one? I just rebased to master and pushed.

Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still lgtm

@grahamwhaley
Copy link
Copy Markdown
Contributor

As this only touches s390 files, which does not CI on this repo, no need to test. It also brings the s390 kernel up to date with our 4.19 default. force merging...

@grahamwhaley grahamwhaley merged commit f8acf38 into kata-containers:master Mar 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants