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 #154

Merged
merged 2 commits into from
Sep 19, 2024

Conversation

arnaldo2792
Copy link
Contributor

Issue number:

N / A

Description of changes:

Update to 5.10.225 and 5.15.166

No config changes were detected:

diff '--color=auto' directory-for-base-configs/config-5.10-aarch64.config directory-for-updated-configs/config-5.10-aarch64.config
3c3
< # Linux/arm64 5.10.224 Kernel Configuration
---
> # Linux/arm64 5.10.225 Kernel Configuration
diff '--color=auto' 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.224 Kernel Configuration
---
> # Linux/x86 5.10.225 Kernel Configuration
diff '--color=auto' directory-for-base-configs/config-5.15-aarch64.config directory-for-updated-configs/config-5.15-aarch64.config
3c3
< # Linux/arm64 5.15.165 Kernel Configuration
---
> # Linux/arm64 5.15.166 Kernel Configuration
diff '--color=auto' 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.165 Kernel Configuration
---
> # Linux/x86 5.15.166 Kernel Configuration
File: packages/kernel-5.10/patch_changes/summary
Patches that changed:
0226-tools-Add-some-generic-functions-and-headers.patch -> 0226-tools-Add-some-generic-functions-and-headers.patch
0229-objtool-arm64-Add-base-definition-for-arm64-backend.patch -> 0229-objtool-arm64-Add-base-definition-for-arm64-backend.patch
0259-objtool-arm64-Add-unwind_hint-support.patch -> 0259-objtool-arm64-Add-unwind_hint-support.patch
Patches that were dropped:
0271-ipc-replace-costly-bailout-check-in-sysvipc_find_ipc.patch
0872-nfsd-Don-t-call-freezable_schedule_timeout-after-eac.patch
Patches that were added:
0874-fou-Fix-null-ptr-deref-in-GRO.patch
0875-net-mlx5-Update-log_max_qp-value-to-FW-max-capabilit.patch
0876-x86-cpu-Add-several-Intel-server-CPU-model-numbers.patch
0877-intel_idle-add-Emerald-Rapids-Xeon-support.patch
File: packages/kernel-5.15/patch_changes/summary
Patches that changed:
Patches that were dropped:
Patches that were added:
0161-fou-Fix-null-ptr-deref-in-GRO.patch
0162-tools-Drop-downstream-version-of-ALIGN_DOWN-macro.patch

Testing done:

5.10 aarch64 boots

[ssm-user@control]$ uname -a
Linux ip-172-31-20-163.us-west-2.compute.internal 5.10.225 #1 SMP Thu Sep 19 00:28:41 UTC 2024 aarch64 aarch64 aarch64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "6ac4c13a-dirty",
    "pretty_name": "Bottlerocket OS 1.23.0 (aws-ecs-1)",
    "variant_id": "aws-ecs-1",
    "version_id": "1.23.0"
  }
}
[ssm-user@control]$

5.10 x86_64 boots

[ssm-user@control]$ uname -a
Linux ip-172-31-23-64.us-west-2.compute.internal 5.10.225 #1 SMP Thu Sep 19 00:20:22 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "6ac4c13a-dirty",
    "pretty_name": "Bottlerocket OS 1.23.0 (aws-ecs-1)",
    "variant_id": "aws-ecs-1",
    "version_id": "1.23.0"
  }
}
[ssm-user@control]$

5.15 aarch64 boots

[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "6ac4c13a-dirty",
    "pretty_name": "Bottlerocket OS 1.23.0 (aws-k8s-1.25)",
    "variant_id": "aws-k8s-1.25",
    "version_id": "1.23.0"
  }
}
[ssm-user@control]$ uname -a
Linux ip-172-31-26-206.us-west-2.compute.internal 5.15.166 #1 SMP Thu Sep 19 00:28:31 UTC 2024 aarch64 aarch64 aarch64 GNU/Linux
[ssm-user@control]$

5.15 x86_64 boots

[ssm-user@control]$ uname -a
Linux ip-172-31-29-154.us-west-2.compute.internal 5.15.166 #1 SMP Thu Sep 19 00:20:18 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "6ac4c13a-dirty",
    "pretty_name": "Bottlerocket OS 1.23.0 (aws-k8s-1.25)",
    "variant_id": "aws-k8s-1.25",
    "version_id": "1.23.0"
  }
}
[ssm-user@control]$

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.225-213.878.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Rebase to Amazon Linux upstream version 5.15.166-111.163.amzn2.

Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
@arnaldo2792 arnaldo2792 merged commit 412ed0b into bottlerocket-os:develop Sep 19, 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