feat: update Linux to 6.6.59

Latest LTS kernel. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit df45e16)
siderolabs · Nov 12, 2024 · 079ea13 · 079ea13
1 parent e4bc753
commit 079ea13
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 79 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -68,9 +68,9 @@ vars:
   ipxe_sha512: 3f9fce7d9c78fcaff7663502cf797e4045c2593d1d23a4abf6db688e443173ca43cc5f960b69ecd9364591062dfde088f99aa3625cd87cbfffcab1fad1166a59
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.6.58
-  linux_sha256: e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db
-  linux_sha512: 695203f9f4486a928ab50bbfb761feeebd59b82f0e090fb126a8584dd676bcc5a6c6a5feb8c5d576891d7ae3ae31cca3a35c2655f06e8410818c24a1edfe0136
+  linux_version: 6.6.59
+  linux_sha256: 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d
+  linux_sha512: f3de2ecb8cfd297d8a0123dc34d5fd1446ffc12f6a0c574f089e13e222b45dd6a4cf232588cd36c9c6818b32e3408c66c75c9ad9f4acd0a297e96e87668e63ba
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 33

diff --git a/drbd/patches/genlmsg_multicast_allns.patch b/drbd/patches/genlmsg_multicast_allns.patch
@@ -0,0 +1,13 @@
+diff --git a/drbd/drbd-headers/linux/genl_magic_func-genl_register_family_with_ops_groups.h b/drbd/drbd-headers/linux/genl_magic_func-genl_register_family_with_ops_groups.h
+index b7adc48..5c930bf 100644
+--- a/drbd/drbd-headers/linux/genl_magic_func-genl_register_family_with_ops_groups.h
++++ b/drbd/drbd-headers/linux/genl_magic_func-genl_register_family_with_ops_groups.h
+@@ -19,7 +19,7 @@ static int CONCAT_(GENL_MAGIC_FAMILY, _genl_multicast_ ## group)(	\
+ 	unsigned int group_id =						\
+ 		CONCAT_(GENL_MAGIC_FAMILY, _group_ ## group);		\
+ 	return genlmsg_multicast_allns(&ZZZ_genl_family, skb, 0,	\
+-				 group_id, flags);			\
++				 group_id);			\
+ }
+
+ #include GENL_MAGIC_INCLUDE_FILE
diff --git a/drbd/pkg.yaml b/drbd/pkg.yaml
@@ -14,6 +14,8 @@ steps:
     prepare:
       - |
         tar -xzf drbd.tar.gz --strip-components=1
+
+        patch -p1 < /pkg/patches/genlmsg_multicast_allns.patch
     build:
       - |
         make -j $(nproc) -C drbd KERNEL_SOURCES=/src MODVERSIONS=detect KDIR=/src

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.58 Kernel Configuration
+# Linux/x86 6.6.59 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.3.0"
 CONFIG_CC_IS_GCC=y
@@ -494,8 +494,7 @@ CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_DYNAMIC_MEMORY_LAYOUT=y
 CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
-CONFIG_ADDRESS_MASKING=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x1
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.58 Kernel Configuration
+# Linux/arm64 6.6.59 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.3.0"
 CONFIG_CC_IS_GCC=y

diff --git a/kernel/build/patches/README.md b/kernel/build/patches/README.md
@@ -1,4 +1,3 @@
 | Patch file                                                                 | Description                                | Upstream status | Link                                                                                                                                                                                                         |
 |----------------------------------------------------------------------------|--------------------------------------------|-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | mpt3sas-ubsan.patch | Backport fixes for UBSAN reporting | in 6.8 | Commit fd7090e384725edb1910a4b0a9c51007858f2c81 |
-| netfilter.patch | Fix netfilter with ipv6 | in main | should be backported to the next stable release |
diff --git a/kernel/build/patches/netfilter.patch b/kernel/build/patches/netfilter.patch