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

Update kernels: 5.10.220, 5.15.162, 6.1.97 #46

Merged

Conversation

ginglis13
Copy link
Contributor

@ginglis13 ginglis13 commented Jul 23, 2024

Issue number:

n/a

Description of changes:

Update kernels to the latest upstream versions:

  • 5.10.220-209.869
  • 5.15.162-107.160
  • 6.1.97-104.177

Fix ARCH -> BUILDSYS_ARCH in tools/diff-kernel-config

Additionally, revert changes to update quick-xml dependency of netdog; see #47

Patch Changes

Kernel-5.10 patches summary:

Patches that changed:
Patches that were dropped:
Patches that were added:
0867-arm64-bpf-Remove-128MB-limit-for-BPF-JIT-programs.patch
0868-iommu-Optimise-PCI-SAC-address-trick.patch

Kernel-5.15 patches summary:

Patches that changed:
Patches that were dropped:
0158-nfs-Leave-pages-in-the-pagecache-if-readpage-failed.patch
Patches that were added:
0158-Revert-kheaders-explicitly-define-file-modes-for-arc.patch
0159-Revert-Revert-kheaders-substituting-sort-in-archive-.patch

The patch 0159-Revert-Revert-kheaders-substituting-sort-in-archive-.patch looks suspicious, with the trailing -, but this is due to patch filename length restrictions.

Kernel-6.1 patches summary:

Patches that changed:
0090-crypto-ecdh-zeroize-crpytographic-keys-after-use.patch -> 0090-crypto-ecdh-zeroize-crpytographic-keys-after-use.patch
Patches that were dropped:
Patches that were added:

Configuration Changes

None.

...
config-aarch64-5.10-diff:         0 removed,   0 added,   0 changed
config-aarch64-5.15-diff:         0 removed,   0 added,   0 changed
config-aarch64-6.1-diff:          0 removed,   0 added,   0 changed
config-x86_64-5.10-diff:          0 removed,   0 added,   0 changed
config-x86_64-5.15-diff:          0 removed,   0 added,   0 changed
config-x86_64-6.1-diff:   0 removed,   0 added,   0 changed

Diff report:

==> configs/config-aarch64-5.10-diff <==

==> configs/config-aarch64-5.15-diff <==

==> configs/config-aarch64-6.1-diff <==

==> configs/config-x86_64-5.10-diff <==

==> configs/config-x86_64-5.15-diff <==

==> configs/config-x86_64-6.1-diff <==

Testing done:

Launched 6 instances, all booted:

  • aws-k8s-1.23, x86_64
  • aws-k8s-1.23, aarch64
  • aws-k8s-1.24, x86_64
  • aws-k8s-1.24, aarch64
  • aws-k8s-1.28, x86_64
  • aws-k8s-1.28, aarch64

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 package kernel-6.1.97-104.177.amzn2023.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
Rebase to Amazon Linux upstream version package kernel-5.10.220-209.869.amzn2.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
Rebase to Amazon Linux upstream version package kernel-5.15.162-107.160.amzn2.src.rpm.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13 ginglis13 changed the title Kernel updates 2024 07 22 Update kernels: 5.10.220, 5.15.162, 6.1.97 Jul 23, 2024
The update made to the quick-xml crate results in a breaking change to
netdog. revert this update to prioritize a release of the core-kit with
kernel updates. The fix to modify netdog to use the newer quick-xml
create will come separately.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13
Copy link
Contributor Author

^ force push adds commit to revert update to quick-xml, which was causing nodes not to boot properly (see #47)

@ginglis13 ginglis13 marked this pull request as ready for review July 23, 2024 20:24
Copy link
Contributor

@koooosh koooosh left a comment

Choose a reason for hiding this comment

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

Already reviewed while PR was in draft state. LGTM!

Copy link
Member

@larvacea larvacea left a comment

Choose a reason for hiding this comment

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

LGTM.

@ginglis13 ginglis13 merged commit d8ab6c4 into bottlerocket-os:develop Jul 23, 2024
2 checks passed
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