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-6.1: update to 6.1.102 #73

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

larvacea
Copy link
Member

@larvacea larvacea commented Aug 9, 2024

Rebase to Amazon Linux upstream version 6.1.102-108.177.amzn2023. Disable two newly selected virtio drivers from upstream.

Description of changes:

Update to the latest upstream 6.1.102-108.177, and add two variables to config-bottlerocket to disable drivers newly added in this upstream release:

# CONFIG_DRM_VIRTIO_GPU is not set
# CONFIG_VIRTIO_DMA_SHARED_BUFFER is not set

These were not set in prior releases, so this maintains the Bottlerocket status quo. Aside from that, there is one new configuration from upstream:

CONFIG_PTP_1588_CLOCK_VMCLOCK=y

No patches in this update conflict with Bottlerocket patches.

Testing done:

  • bottlerocket-core-kit builds (both architectures)
  • bottlerocket variant aws-k8s-1.29 builds and boots (both architectures)

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 6.1.102-108.177.amzn2023.
Disable two newly selected virtio drivers from upstream.

Signed-off-by: Martin Harriman <larvacea@mac.com>
Copy link
Contributor

@ytsssun ytsssun left a comment

Choose a reason for hiding this comment

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

I verified the sha512. LGTM

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.

Verified SHA as well. LGTM!

@larvacea larvacea merged commit 719f1da into bottlerocket-os:develop Aug 9, 2024
2 checks passed
@larvacea larvacea deleted the k61-update branch August 9, 2024 19:52
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