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

1.20.x: cherry pick kernel updates from bottlerocket-core-kit #4104

Merged
merged 6 commits into from
Jul 26, 2024

Conversation

larvacea
Copy link
Member

@larvacea larvacea commented Jul 25, 2024

Description of changes:

Cherry-pick -x all kernel package changes from bottlerocket-core-kit.

End result:

  • kernel-5.10: 5.10.220-209.869
  • kernel-5.15: 5.15.162-107
  • kernel-6.1: 6.1.97-104

Testing done:

Each of these kernel updates was tested before merging to bottlerocket-core-kit, and I consumed them while testing pluto and proxy settings for aws-ecs-1, aws-ecs-2, aws-k8s-1.23 through 1.30 (both nvidia and not-nvidia variants).

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.

arnaldo2792 and others added 5 commits July 25, 2024 21:07
Rebase to Amazon Linux upstream version package kernel-5.10.220-209.867.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
(cherry picked from commit 6274ac3a9ef31a6ba1d72e46f57d3ec63ea3aebe)
Rebase to Amazon Linux upstream version package kernel-5.15.161-106.159.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
(cherry picked from commit d282582b7a9b9a52ed540e0a73608a4e0f3752f2)
Rebase to Amazon Linux upstream version package kernel-5.15.162-107.160.amzn2.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
(cherry picked from commit 38abe735053dc98cb26c75c50b6f4ce98f4bd299)
Rebase to Amazon Linux upstream version package kernel-6.1.96-102.177.amzn2023

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
(cherry picked from commit 71e1540992b822d879cddf037f922260605c78d5)
Rebase to Amazon Linux upstream version package kernel-6.1.97-104.177.amzn2023.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
(cherry picked from commit 711d00f488878e282d4bb926b4c3102c3b7a1410)
@ginglis13
Copy link
Contributor

This is missing bottlerocket-os/bottlerocket-core-kit@7cdde8b

@ginglis13 ginglis13 mentioned this pull request Jul 25, 2024
5 tasks
Rebase to Amazon Linux upstream version package kernel-5.10.220-209.869.amzn2.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
(cherry picked from commit 7cdde8be54c269e31f84b8744b99fa7bd516a7cb)
@larvacea
Copy link
Member Author

Added the missing cherry-pick of 7cdde8b, moving from 5.10.220-209.867 to 5.10.220-209.869.

Numbers are hard. That's why I majored in math. No numbers there.

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