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.106 #126

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

vyaghras
Copy link
Contributor

@vyaghras vyaghras commented Sep 4, 2024

Issue number:

Closes #

Description of changes:

  • Update Kernel kernel-6.1: update to 6.1.106
    Configuration changes:
config-6.1-aarch64.config
3c3
< # Linux/arm64 6.1.102 Kernel Configuration
---
> # Linux/arm64 6.1.106 Kernel Configuration
380a381
> CONFIG_ARM64_ERRATUM_3194386=y
1035a1037
> CONFIG_PCP_BATCH_SCALE_MAX=5
2510c2512
< # CONFIG_MLX5_FPGA is not set
---
> CONFIG_MLX5_FPGA=y
2520,2521c2522,2523
< # CONFIG_MLX5_CORE_IPOIB is not set
< # CONFIG_MLX5_EN_IPSEC is not set
---
> CONFIG_MLX5_CORE_IPOIB=y
> CONFIG_MLX5_EN_IPSEC=y
2523c2525,2526
< # CONFIG_MLX5_SF is not set
---
> CONFIG_MLX5_SF=y
> CONFIG_MLX5_SF_MANAGER=y
4567a4571
> CONFIG_AMAZON_SCSI_MPI3MR=m


config-6.1-x86_64.config
3c3
< # Linux/x86 6.1.102 Kernel Configuration
---
> # Linux/x86 6.1.106 Kernel Configuration
1041a1042
> CONFIG_PCP_BATCH_SCALE_MAX=5
2492c2493
< # CONFIG_MLX5_FPGA is not set
---
> CONFIG_MLX5_FPGA=y
2502,2503c2503,2504
< # CONFIG_MLX5_CORE_IPOIB is not set
< # CONFIG_MLX5_EN_IPSEC is not set
---
> CONFIG_MLX5_CORE_IPOIB=y
> CONFIG_MLX5_EN_IPSEC=y
2505c2506,2507
< # CONFIG_MLX5_SF is not set
---
> CONFIG_MLX5_SF=y
> CONFIG_MLX5_SF_MANAGER=y
4510a4513
> CONFIG_AMAZON_SCSI_MPI3MR=m

Added patches:

Patches that changed:
Patches that were dropped:
Patches that were added:
0182-Add-out-of-tree-mpi3mr-8.9.1-driver.patch
0183-scsi-mpi3mr-Sanitise-num_phys.patch
0184-scsi-mpi3mr-Avoid-memcpy-field-spanning-write-WARNIN.patch
0185-bpf-add-mrtt-and-srtt-as-BPF_SOCK_OPS_RTT_CB-args.patch
0186-x86-kaslr-Expose-and-use-the-end-of-the-physical-mem.patch
0187-x86-ioremap-Use-is_ioremap_addr-in-iounmap.patch

Testing done:

  • aarch64 aws-k8s-1.28
NAME                            TYPE           STATE               PASSED	 FAILED       SKIPPED   BUILD ID             LAST UPDATE
 aarch64-aws-k8s-128-quick	 Test           passed                   5            0          7389   d2ab432c-dirty       2024-09-05T00:21:46Z
 aarch64-aws-k8s-128             Resource	completed                                               d2ab432c-dirty       2024-09-05T00:20:06Z
  • x86_64 aws-k8s-1.28 Boot test Successful
NAME                                   TYPE          STATE             PASSED      FAILED	SKIPPED   BUILD ID            LAST UPDATE
 x86-64-aws-k8s-128-quick               Test          passed                 5           0         7389   d2ab432c-dirty      2024-09-05T00:47:55Z
 x86-64-aws-k8s-128                     Resource      completed                                           d2ab432c-dirty      2024-09-05T00:46:15Z
 x86-64-aws-k8s-128-instances-nfip	Resource      completed                                           d2ab432c-dirty      2024-09-05T00:48:59Z


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.106-116.188.amzn2023.

Signed-off-by: Shikha Vyaghra <vyaghras@amazon.com>
Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

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

LGTM!

@vyaghras vyaghras merged commit 71c684b into bottlerocket-os:develop Sep 5, 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