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

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

rpkelly
Copy link
Contributor

@rpkelly rpkelly commented Dec 20, 2024

Description of changes:

Update 5.10 and 5.15 kernels to latest from Amazon Linux.

Summary for kernel-5.10
Patches that changed:
Patches that were dropped:
0881-Revert-ext4-fix-warning-in-ext4_dio_write_end_io.patch
0882-Revert-ext4-dax-fix-overflowing-extents-beyond-inode.patch
0883-Revert-ext4-properly-sync-file-size-update-after-O_S.patch
Patches that were added:
0881-mm-hugetlb-call-huge_pte_offset-with-i_mmap_rwsem-he.patch
0882-cifs-Fix-buffer-overflow-when-parsing-NFS-reparse-po.patch
0883-net-make-sock_inuse_add-available.patch
0884-smb-client-Fix-use-after-free-of-network-namespace.patch
Summary for kernel-5.15
Patches that changed:
0114-mptcp-add-TCP_INQ-cmsg-support.patch -> 0114-mptcp-add-TCP_INQ-cmsg-support.patch
0122-mptcp-support-TCP_CORK-and-TCP_NODELAY.patch -> 0122-mptcp-support-TCP_CORK-and-TCP_NODELAY.patch
Patches that were dropped:
Patches that were added:
0166-cifs-Fix-buffer-overflow-when-parsing-NFS-reparse-po.patch
0167-net-make-sock_inuse_add-available.patch
0168-smb-client-Fix-use-after-free-of-network-namespace.patch

5.10 aarch64 Config diff

3c3                                                                                                                                                                                                                 
< # Linux/arm64 5.10.228 Kernel Configuration                                                                                                                                                                       
---                                                                                                                                                                                                                 
> # Linux/arm64 5.10.230 Kernel Configuration                                                                                                                                                                       
5c5                                                                                                                                                                                                                 
< CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2022.11.1) 11.3.0"                                                                                                                          
---                                                                                                                                                                                                                 
> CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.02.8) 11.4.0"                                                                                                                          
7,8c7,8                                                                                                                                                                                                             
< CONFIG_GCC_VERSION=110300                                                                                                                                                                                         
< CONFIG_LD_VERSION=238000000                                                                                                                                                                                       
---                                                                                                                                                                                                                 
> CONFIG_GCC_VERSION=110400                                                                                                                                                                                         
> CONFIG_LD_VERSION=241000000                                                                                                                                                                                       
11c11                                                                                                                                                                                                               
< CONFIG_AS_VERSION=23800                                                                                                                                                                                           
---                                                                                                                                                                                                                 
> CONFIG_AS_VERSION=24100                                                                                                                                                                                           
12a13,14                                                                                                                                                                                                            
> CONFIG_CC_CAN_LINK=y
> CONFIG_CC_CAN_LINK_STATIC=y
230a233
> # CONFIG_BPF_PRELOAD_UMD is not set
1554a1558
> # CONFIG_BPFILTER_UMH is not set

5.10 x86_64 Config diff

diff ../current-latest/config-5.10-x86_64.config ../updated-configs/config-5.10-x86_64.config
3c3
< # Linux/x86 5.10.228 Kernel Configuration
---
> # Linux/x86 5.10.230 Kernel Configuration
5c5
< CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2022.11.1) 11.3.0"
---
> CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.02.8) 11.4.0"
7,8c7,8
< CONFIG_GCC_VERSION=110300
< CONFIG_LD_VERSION=238000000
---
> CONFIG_GCC_VERSION=110400
> CONFIG_LD_VERSION=241000000
11c11
< CONFIG_AS_VERSION=23800
---
> CONFIG_AS_VERSION=24100
12a13,14
> CONFIG_CC_CAN_LINK=y
> CONFIG_CC_CAN_LINK_STATIC=y
248a251
> # CONFIG_BPF_PRELOAD_UMD is not set
1539a1543
> # CONFIG_BPFILTER_UMH is not setc

5.15 aarch64 Config diff

diff ../current-latest/config-5.15-aarch64.config ../updated-configs/config-5.15-aarch64.config
3c3
< # Linux/arm64 5.15.168 Kernel Configuration
---
> # Linux/arm64 5.15.173 Kernel Configuration
5c5
< CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2022.11.1) 11.3.0"
---
> CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.02.8) 11.4.0"
7c7
< CONFIG_GCC_VERSION=110300
---
> CONFIG_GCC_VERSION=110400
10c10
< CONFIG_AS_VERSION=23800
---
> CONFIG_AS_VERSION=24100
12c12
< CONFIG_LD_VERSION=23800
---
> CONFIG_LD_VERSION=24100
13a14,15
> CONFIG_CC_CAN_LINK=y
> CONFIG_CC_CAN_LINK_STATIC=y
100a103
> # CONFIG_BPF_PRELOAD_UMD is not set
1540a1544
> # CONFIG_BPFILTER_UMH is not set

5.15 x86_64 Config diff

diff ../current-latest/config-5.15-x86_64.config ../updated-configs/config-5.15-x86_64.config
3c3
< # Linux/x86 5.15.168 Kernel Configuration
---
> # Linux/x86 5.15.173 Kernel Configuration
5c5
< CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2022.11.1) 11.3.0"
---
> CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.02.8) 11.4.0"
7c7
< CONFIG_GCC_VERSION=110300
---
> CONFIG_GCC_VERSION=110400
10c10
< CONFIG_AS_VERSION=23800
---
> CONFIG_AS_VERSION=24100
12c12
< CONFIG_LD_VERSION=23800
---
> CONFIG_LD_VERSION=24100
13a14,15
> CONFIG_CC_CAN_LINK=y
> CONFIG_CC_CAN_LINK_STATIC=y
118a121
> # CONFIG_BPF_PRELOAD_UMD is not set
1532a1536
> # CONFIG_BPFILTER_UMH is not set

Testing done:

Kernel kit successfully builds

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.230-223.885.amzn2.

Signed-off-by: Richard Kelly <[email protected]>
Rebase to Amazon Linux upstream version 5.15.173-118.169.amzn2.

Remove netfilter typo patch as AL's latest 5.15 kernel includes it in
the tree
amazonlinux/linux@90baa45

Signed-off-by: Richard Kelly <[email protected]>
@rpkelly rpkelly changed the title Update 20241219 Update Kernels 5.10 and 5.15 Dec 20, 2024
@ginglis13 ginglis13 merged commit 714b023 into bottlerocket-os:develop Dec 20, 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.

3 participants