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

Kernel updates: 5.10.219 and 6.1.94 #4080

Merged
merged 3 commits into from
Jul 4, 2024

Conversation

larvacea
Copy link
Member

@larvacea larvacea commented Jul 3, 2024

Description of changes:

Update kernels to the latest upstream versions.

Testing done:

Built aws-k8s AMIs and ran quick sonobuoy tests to verify that these changes work here. Previously built and tested for the core kit.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Rebase to Amazon Linux upstream version 5.10.219-208.866.amzn2.

Signed-off-by: Martin Harriman <[email protected]>
(cherry picked from commit b1041aff8e094a1e117e8c9c408432eb9734eebb)
Rebase to Amazon Linux upstream version 6.1.94-99.176.amzn2023.

Signed-off-by: Martin Harriman <[email protected]>
(cherry picked from commit 50aeb9e236275ca13e0ec1a1518116316dfcdbe7)
(cherry picked from commit 656aa8a1023f8627061443fb28b06f5d41c38b06)
@koooosh
Copy link
Contributor

koooosh commented Jul 4, 2024

nit/question: Why are we not including the 3rd commit Add files to kernel-6.1.spec as a part of the 2nd one for kernel-6.1?

@koooosh koooosh self-requested a review July 4, 2024 01:30
@larvacea
Copy link
Member Author

larvacea commented Jul 4, 2024

The correct answer to "why is the add files commit separate from the update kernel 6.1 commit" is that it was a mistake. Now it is a mistake visible in two separate repositories. In retrospect I certainly would be happier right now if I had a single commit to cherry-pick. Now if one takes either commit without the other, the build breaks.

@larvacea larvacea merged commit cf265ad into bottlerocket-os:1.20.x Jul 4, 2024
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.

4 participants