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 and 5.15 #177

Merged
merged 2 commits into from
Oct 3, 2024

Conversation

koooosh
Copy link
Contributor

@koooosh koooosh commented Oct 3, 2024

Issue number:

N/A

Description of changes:

Update to 5.10.226 and 5.15.167

No config changes were detected:

diff directory-for-base-configs/config-5.10-aarch64.config directory-for-updated-configs/config-5.10-aarch64.config
3c3
< # Linux/arm64 5.10.225 Kernel Configuration
---
> # Linux/arm64 5.10.226 Kernel Configuration
diff directory-for-base-configs/config-5.10-x86_64.config directory-for-updated-configs/config-5.10-x86_64.config
3c3
< # Linux/x86 5.10.225 Kernel Configuration
---
> # Linux/x86 5.10.226 Kernel Configuration
diff directory-for-base-configs/config-5.15-aarch64.config directory-for-updated-configs/config-5.15-aarch64.config
3c3
< # Linux/arm64 5.15.166 Kernel Configuration
---
> # Linux/arm64 5.15.167 Kernel Configuration
diff directory-for-base-configs/config-5.15-x86_64.config directory-for-updated-configs/config-5.15-x86_64.config
3c3
< # Linux/x86 5.15.166 Kernel Configuration
---
> # Linux/x86 5.15.167 Kernel Configuration

File: packages/kernel-5.10/patch_changes/summary

Patches that changed:
Patches that were dropped:
0874-fou-Fix-null-ptr-deref-in-GRO.patch
Patches that were added:
0877-ima-Fix-use-after-free-on-a-dentry-s-dname.name.patch
0878-AL2-5.10-Update-lustrefsx-to-2.12.8-fsx11.patch

File: packages/kernel-5.15/patch_changes/summary

Patches that changed:
0114-mptcp-add-TCP_INQ-cmsg-support.patch -> 0114-mptcp-add-TCP_INQ-cmsg-support.patch
Patches that were dropped:
0161-fou-Fix-null-ptr-deref-in-GRO.patch
Patches that were added:
0162-ima-Fix-use-after-free-on-a-dentry-s-dname.name.patch
0163-AL2-5.15-Update-lustrefsx-to-2.12.8-fsx11-commit.patch
0164-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch

Testing done:

  • 5.10 aarch64 boots
[ssm-user@control]$  uname -a
Linux ip-172-31-7-172.us-west-2.compute.internal 5.10.226 #1 SMP Thu Oct 3 03:04:14 UTC 2024 aarch64 aarch64 aarch64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "e71878c9-dirty",
    "pretty_name": "Bottlerocket OS 1.24.0 (aws-k8s-1.23)",
    "variant_id": "aws-k8s-1.23",
    "version_id": "1.24.0"
  }
}
  • 5.10 x86_64 boots
[ssm-user@control]$  uname -a
Linux ip-172-31-3-48.us-west-2.compute.internal 5.10.226 #1 SMP Thu Oct 3 02:42:34 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "e71878c9-dirty",
    "pretty_name": "Bottlerocket OS 1.24.0 (aws-k8s-1.23)",
    "variant_id": "aws-k8s-1.23",
    "version_id": "1.24.0"
  }
}
  • 5.15 aarch64 boots
[ssm-user@control]$ uname -a
Linux ip-172-31-7-24.us-west-2.compute.internal 5.15.167 #1 SMP Thu Oct 3 03:04:04 UTC 2024 aarch64 aarch64 aarch64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "e71878c9-dirty",
    "pretty_name": "Bottlerocket OS 1.24.0 (aws-k8s-1.27)",
    "variant_id": "aws-k8s-1.27",
    "version_id": "1.24.0"
  }
}
  • 5.15 x86_64 boots
[ssm-user@control]$ uname -a
Linux ip-172-31-2-8.us-west-2.compute.internal 5.15.167 #1 SMP Thu Oct 3 02:42:28 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "e71878c9-dirty",
    "pretty_name": "Bottlerocket OS 1.24.0 (aws-k8s-1.27)",
    "variant_id": "aws-k8s-1.27",
    "version_id": "1.24.0"
  }
}

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.15.167-112.165.amzn2.

Signed-off-by: Kush Upadhyay <[email protected]>
Rebase to Amazon Linux upstream version 5.10.226-214.879.amzn2.

Signed-off-by: Kush Upadhyay <[email protected]>
@koooosh koooosh marked this pull request as ready for review October 3, 2024 04:41
@koooosh koooosh merged commit b3f8f89 into bottlerocket-os:develop Oct 3, 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.

5 participants