Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kernel to 5.10.197 #5717

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Conversation

runlevel5
Copy link
Contributor

@runlevel5 runlevel5 commented Oct 3, 2023

Changes

  • Bump kernel to 5.10.197
  • Bump to GCC 11

@op-jenkins
Copy link
Contributor

Can one of the admins verify this patch?

@IlyaSmirnov91
Copy link

ok to test

@IlyaSmirnov91
Copy link

@runlevel5 , the compilation fails with this error:

linux-headers 5.10.197 Patching
for p in /tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/openpower/linux ; do if test -d $p ; then PATH=/tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/output/host/bin:$PATH support/scripts/apply-patches.sh /tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/output/build/linux-headers-5.10.197 $p *.patch || exit 1 ; else PATH=/tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/output/host/bin:$PATH support/scripts/apply-patches.sh /tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/output/build/linux-headers-5.10.197 dirname $p basename $p || exit 1; fi done

Applying 0001-xhci-Reset-controller-on-xhci-shutdown.patch using patch:
patching file drivers/usb/host/xhci.c
Hunk #1 succeeded at 816 (offset 4 lines).

Applying 0002-Release-OpenPower-kernel.patch using patch:
patching file Makefile
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
make: *** [package/pkg-generic.mk:251: /tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/output/build/linux-headers-5.10.197/.stamp_patched] Error 1
make: Leaving directory '/tmp/hostboot-jenkins.swg-devops/jenkins-agent/workspace/Hostboot/OpenPower/GHPR/ubuntu-ppc64le-4671/CONFIG/witherspoon/OS/ubuntu/build/op-build/buildroot'

It can't apply the patch. Maybe we don't even need that patch anymore?

@runlevel5
Copy link
Contributor Author

@IlyaSmirnov91 good catch, let me have a look into why it does not apply cleanly with witherspoon

Signed-off-by: Trung Lê <[email protected]>
@runlevel5
Copy link
Contributor Author

@IlyaSmirnov91 just pushed, let's try again

@IlyaSmirnov91
Copy link

Between two retriggers, I've seen HW CI pass on all machines (just not at the same time :) ). Merging.

@IlyaSmirnov91 IlyaSmirnov91 merged commit 6730c03 into open-power:master Oct 5, 2023
1 check passed
@runlevel5 runlevel5 deleted the kernel-5-10-197 branch October 5, 2023 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants