diff mbox series

kernel: update to 6.1.56

Message ID 20231007201649.3897712-1-arne_f@ipfire.org
State Staged
Commit e275a07b67d7e232e251df92f79b7d947361ea4b
Headers
Series kernel: update to 6.1.56 |

Commit Message

Arne Fitzenreiter Oct. 7, 2023, 8:16 p.m. UTC 
  this also builds the dtb files on riscv64

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/kernel/kernel.config.aarch64-ipfire    |   6 +-
 config/kernel/kernel.config.riscv64-ipfire    |   7 +-
 config/kernel/kernel.config.x86_64-ipfire     |   8 +-
 config/rootfiles/common/aarch64/linux         |  11 +-
 config/rootfiles/common/riscv64/linux         |  25 ++--
 lfs/linux                                     |   8 +-
 ...layer7.patch => linux-6.1.56-layer7.patch} | 108 ++++++++----------
 7 files changed, 64 insertions(+), 109 deletions(-)
 rename src/patches/linux/{linux-6.1.27-layer7.patch => linux-6.1.56-layer7.patch} (94%)
diff mbox series

Patch

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 96944c3d5..278b51e05 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@ 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.53-ipfire Kernel Configuration
+# Linux/arm64 6.1.56-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1545,8 +1545,6 @@  CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -5054,8 +5052,6 @@  CONFIG_MEDIA_ATTACH=y
 #
 CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_CAMERA_SENSOR is not set
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_OV2640=m
 
 #
 # Lens drivers
diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire
index fc2bbaf1e..26ab45dcd 100644
--- a/config/kernel/kernel.config.riscv64-ipfire
+++ b/config/kernel/kernel.config.riscv64-ipfire
@@ -1,6 +1,6 @@ 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.1.53-ipfire Kernel Configuration
+# Linux/riscv 6.1.56-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1247,8 +1247,6 @@  CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -4331,10 +4329,7 @@  CONFIG_MEDIA_ATTACH=y
 # IR I2C driver auto-selected by 'Autoselect ancillary drivers'
 #
 CONFIG_VIDEO_IR_I2C=m
-
 # CONFIG_VIDEO_CAMERA_SENSOR is not set
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_OV2640=m
 
 #
 # Lens drivers
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 129e0d209..893a3d10a 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@ 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.53-ipfire Kernel Configuration
+# Linux/x86 6.1.56-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1587,8 +1587,6 @@  CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -4762,10 +4760,6 @@  CONFIG_MEDIA_ATTACH=y
 #
 CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_CAMERA_SENSOR is not set
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_OV2640=m
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
 
 #
 # Lens drivers
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 754df396e..569f6b834 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -192,6 +192,7 @@  boot/dtb-KVER-ipfire
 #boot/dtb-KVER-ipfire/freescale/imx8mm-mx8menlo.dtb
 #boot/dtb-KVER-ipfire/freescale/imx8mm-nitrogen-r2.dtb
 #boot/dtb-KVER-ipfire/freescale/imx8mm-phyboard-polis-rdk.dtb
+#boot/dtb-KVER-ipfire/freescale/imx8mm-prt8mm.dtb
 #boot/dtb-KVER-ipfire/freescale/imx8mm-tqma8mqml-mba8mx.dtb
 #boot/dtb-KVER-ipfire/freescale/imx8mm-var-som-symphony.dtb
 #boot/dtb-KVER-ipfire/freescale/imx8mm-venice-gw71xx-0x.dtb
@@ -9283,8 +9284,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_FW
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_MATCHALL
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_ROUTE4
-#lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP
-#lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP6
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_U32
 #lib/modules/KVER-ipfire/build/include/config/NET_CORE
 #lib/modules/KVER-ipfire/build/include/config/NET_DEVLINK
@@ -11180,9 +11179,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_MEM2MEM_DEINTERLACE
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_MESON_GE2D
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_MSP3400
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_MT9M111
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_MT9V011
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_OV2640
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2_DVB
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2_SYSFS
@@ -20134,9 +20130,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ir-kbd-i2c.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/m52790.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/msp3400.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/mt9m111.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/mt9v011.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ov2640.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa6588.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa6752hs.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa7115.ko.xz
@@ -22190,8 +22183,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_fw.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_matchall.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/em_ipset.ko.xz
diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux
index 48660ee40..3eb475450 100644
--- a/config/rootfiles/common/riscv64/linux
+++ b/config/rootfiles/common/riscv64/linux
@@ -1,5 +1,16 @@ 
 boot/System.map-KVER-ipfire
 boot/config-KVER-ipfire
+boot/dtb-KVER-ipfire
+#boot/dtb-KVER-ipfire/microchip
+#boot/dtb-KVER-ipfire/microchip/mpfs-icicle-kit.dtb
+#boot/dtb-KVER-ipfire/microchip/mpfs-m100pfsevp.dtb
+#boot/dtb-KVER-ipfire/microchip/mpfs-polarberry.dtb
+#boot/dtb-KVER-ipfire/microchip/mpfs-sev-kit.dtb
+#boot/dtb-KVER-ipfire/sifive
+#boot/dtb-KVER-ipfire/sifive/hifive-unleashed-a00.dtb
+#boot/dtb-KVER-ipfire/sifive/hifive-unmatched-a00.dtb
+#boot/dtb-KVER-ipfire/starfive
+#boot/dtb-KVER-ipfire/starfive/jh7100-beaglev-starlight.dtb
 boot/vmlinuz-KVER-ipfire
 etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
@@ -8393,8 +8404,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_FW
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_MATCHALL
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_ROUTE4
-#lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP
-#lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP6
 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_U32
 #lib/modules/KVER-ipfire/build/include/config/NET_CORE
 #lib/modules/KVER-ipfire/build/include/config/NET_DEVLINK
@@ -10292,11 +10301,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_M52790
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_MEM2MEM_DEINTERLACE
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_MSP3400
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_MT9M111
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_MT9V011
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_OV2640
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_OV7640
-#lib/modules/KVER-ipfire/build/include/config/VIDEO_OV7670
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2_DVB
 #lib/modules/KVER-ipfire/build/include/config/VIDEO_PVRUSB2_SYSFS
@@ -19282,11 +19286,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ks0127.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/m52790.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/msp3400.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/mt9m111.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/mt9v011.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ov2640.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ov7640.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/media/i2c/ov7670.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa6588.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa6752hs.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/media/i2c/saa7110.ko.xz
@@ -21464,8 +21463,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_fw.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_matchall.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/sched/em_ipset.ko.xz
diff --git a/lfs/linux b/lfs/linux
index 7dedf390e..4dcac1920 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER         = 6.1.53
+VER         = 6.1.56
 ARM_PATCHES = 6.1.y-ipfire2
 
 THISAPP    = linux-$(VER)
@@ -75,7 +75,7 @@  objects = \
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_BLAKE2 = c5c082fa08e331ae968e27f6a0aed41f7793ea38c3a32311e4f9b7dda3cf1ce74dfd7f3e4c783f0dd4269b543eddd53e086e523d324da5e7a996aa4d8e6701ea
+$(DL_FILE)_BLAKE2 = c70da3ecb8f849890fe2b5bf2874a2dd4f468508b508aaf1e7e6773c63845e782e2cf5285e0e7e62ce25e7a4485e1cf033122c4d6fbff0e83b92e172423e7a5c
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
 
 install : $(TARGET)
@@ -113,7 +113,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -svf linux-$(VER) $(DIR_SRC)/linux
 
 	# Layer7-patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1.27-layer7.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1.56-layer7.patch
 
 	# DVB Patches
 	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
@@ -183,7 +183,7 @@  else
 	cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
 	cd $(DIR_APP) && make $(MAKETUNING) modules_install
 
-ifeq "$(BUILD_PLATFORM)" "arm"
+ifneq "$(BUILD_PLATFORM)" "x86"
 	cd $(DIR_APP) && make $(MAKETUNING) dtbs
 	mkdir -p /boot/dtb-$(VER)-$(VERSUFIX)
 	cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \
diff --git a/src/patches/linux/linux-6.1.27-layer7.patch b/src/patches/linux/linux-6.1.56-layer7.patch
similarity index 94%
rename from src/patches/linux/linux-6.1.27-layer7.patch
rename to src/patches/linux/linux-6.1.56-layer7.patch
index 00e0ca4c2..07493faed 100644
--- a/src/patches/linux/linux-6.1.27-layer7.patch
+++ b/src/patches/linux/linux-6.1.56-layer7.patch
@@ -1,22 +1,20 @@ 
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 20ca1613f2e3..8024f760bbe1 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -892,6 +892,9 @@ struct sk_buff {
- 
+diff -Naur linux-6.1.56.org/include/linux/skbuff.h linux-6.1.56/include/linux/skbuff.h
+--- linux-6.1.56.org/include/linux/skbuff.h	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/include/linux/skbuff.h	2023-10-07 14:14:11.094115796 +0200
+@@ -901,6 +901,9 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
  	unsigned long		 _nfct;
-+#endif
+ #endif
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
 +	char			layer7_flags[1];
- #endif
++#endif
  	unsigned int		len,
  				data_len;
-diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
-index 6a2019aaa464..fecc0a5c4b04 100644
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -121,6 +121,23 @@ struct nf_conn {
+ 	__u16			mac_len,
+diff -Naur linux-6.1.56.org/include/net/netfilter/nf_conntrack.h linux-6.1.56/include/net/netfilter/nf_conntrack.h
+--- linux-6.1.56.org/include/net/netfilter/nf_conntrack.h	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/include/net/netfilter/nf_conntrack.h	2023-10-07 14:14:11.094115796 +0200
+@@ -121,6 +121,23 @@
  	/* Extensions */
  	struct nf_ct_ext *ext;
  
@@ -40,11 +38,9 @@  index 6a2019aaa464..fecc0a5c4b04 100644
  	/* Storage reserved for other modules, must be the last member */
  	union nf_conntrack_proto proto;
  };
-diff --git a/include/uapi/linux/netfilter/xt_layer7.h b/include/uapi/linux/netfilter/xt_layer7.h
-new file mode 100644
-index 000000000000..147cd6477858
---- /dev/null
-+++ b/include/uapi/linux/netfilter/xt_layer7.h
+diff -Naur linux-6.1.56.org/include/uapi/linux/netfilter/xt_layer7.h linux-6.1.56/include/uapi/linux/netfilter/xt_layer7.h
+--- linux-6.1.56.org/include/uapi/linux/netfilter/xt_layer7.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/include/uapi/linux/netfilter/xt_layer7.h	2023-10-07 14:14:11.094115796 +0200
 @@ -0,0 +1,13 @@
 +#ifndef _XT_LAYER7_H
 +#define _XT_LAYER7_H
@@ -59,11 +55,10 @@  index 000000000000..147cd6477858
 +};
 +
 +#endif /* _XT_LAYER7_H */
-diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 4b8d04640ff3..9d2140704720 100644
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -1401,6 +1401,26 @@ config NETFILTER_XT_MATCH_L2TP
+diff -Naur linux-6.1.56.org/net/netfilter/Kconfig linux-6.1.56/net/netfilter/Kconfig
+--- linux-6.1.56.org/net/netfilter/Kconfig	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/net/netfilter/Kconfig	2023-10-07 14:14:11.094115796 +0200
+@@ -1401,6 +1401,26 @@
  
  	To compile it as a module, choose M here. If unsure, say N.
  
@@ -90,11 +85,10 @@  index 4b8d04640ff3..9d2140704720 100644
  config NETFILTER_XT_MATCH_LENGTH
  	tristate '"length" match support'
  	depends on NETFILTER_ADVANCED
-diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index 0f060d100880..28a7d4f8be40 100644
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -212,6 +212,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) += xt_recent.o
+diff -Naur linux-6.1.56.org/net/netfilter/Makefile linux-6.1.56/net/netfilter/Makefile
+--- linux-6.1.56.org/net/netfilter/Makefile	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/net/netfilter/Makefile	2023-10-07 14:14:11.094115796 +0200
+@@ -212,6 +212,7 @@
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@@ -102,11 +96,10 @@  index 0f060d100880..28a7d4f8be40 100644
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
-diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 30ed45b1b57d..2f4640fcb6bd 100644
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -604,6 +604,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct)
+diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_core.c linux-6.1.56/net/netfilter/nf_conntrack_core.c
+--- linux-6.1.56.org/net/netfilter/nf_conntrack_core.c	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/net/netfilter/nf_conntrack_core.c	2023-10-07 14:14:11.098115909 +0200
+@@ -604,6 +604,11 @@
  	 */
  	nf_ct_remove_expectations(ct);
  
@@ -118,11 +111,10 @@  index 30ed45b1b57d..2f4640fcb6bd 100644
  	if (ct->master)
  		nf_ct_put(ct->master);
  
-diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index 460294bd4b60..b1e4b9c6d2a4 100644
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -373,6 +373,11 @@ static int ct_seq_show(struct seq_file *s, void *v)
+diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_standalone.c linux-6.1.56/net/netfilter/nf_conntrack_standalone.c
+--- linux-6.1.56.org/net/netfilter/nf_conntrack_standalone.c	2023-10-06 14:57:07.000000000 +0200
++++ linux-6.1.56/net/netfilter/nf_conntrack_standalone.c	2023-10-07 14:14:11.098115909 +0200
+@@ -373,6 +373,11 @@
  	ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
  	ct_show_delta_time(s, ct);
  
@@ -134,11 +126,9 @@  index 460294bd4b60..b1e4b9c6d2a4 100644
  	seq_printf(s, "use=%u\n", refcount_read(&ct->ct_general.use));
  
  	if (seq_has_overflowed(s))
-diff --git a/net/netfilter/regexp/regexp.c b/net/netfilter/regexp/regexp.c
-new file mode 100644
-index 000000000000..900698886531
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
+diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.c linux-6.1.56/net/netfilter/regexp/regexp.c
+--- linux-6.1.56.org/net/netfilter/regexp/regexp.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/net/netfilter/regexp/regexp.c	2023-10-07 14:14:11.098115909 +0200
 @@ -0,0 +1,1197 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1337,11 +1327,9 @@  index 000000000000..900698886531
 +#endif
 +
 +
-diff --git a/net/netfilter/regexp/regexp.h b/net/netfilter/regexp/regexp.h
-new file mode 100644
-index 000000000000..a72eba71fb61
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
+diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.h linux-6.1.56/net/netfilter/regexp/regexp.h
+--- linux-6.1.56.org/net/netfilter/regexp/regexp.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/net/netfilter/regexp/regexp.h	2023-10-07 14:14:11.098115909 +0200
 @@ -0,0 +1,41 @@
 +/*
 + * Definitions etc. for regexp(3) routines.
@@ -1384,22 +1372,18 @@  index 000000000000..a72eba71fb61
 +void regerror(char *s);
 +
 +#endif
-diff --git a/net/netfilter/regexp/regmagic.h b/net/netfilter/regexp/regmagic.h
-new file mode 100644
-index 000000000000..5acf4478ff71
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
+diff -Naur linux-6.1.56.org/net/netfilter/regexp/regmagic.h linux-6.1.56/net/netfilter/regexp/regmagic.h
+--- linux-6.1.56.org/net/netfilter/regexp/regmagic.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/net/netfilter/regexp/regmagic.h	2023-10-07 14:14:11.098115909 +0200
 @@ -0,0 +1,5 @@
 +/*
 + * The first byte of the regexp internal "program" is actually this magic
 + * number; the start node begins in the second byte.
 + */
 +#define	MAGIC	0234
-diff --git a/net/netfilter/regexp/regsub.c b/net/netfilter/regexp/regsub.c
-new file mode 100644
-index 000000000000..339631f06f00
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
+diff -Naur linux-6.1.56.org/net/netfilter/regexp/regsub.c linux-6.1.56/net/netfilter/regexp/regsub.c
+--- linux-6.1.56.org/net/netfilter/regexp/regsub.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/net/netfilter/regexp/regsub.c	2023-10-07 14:14:11.098115909 +0200
 @@ -0,0 +1,95 @@
 +/*
 + * regsub
@@ -1496,11 +1480,9 @@  index 000000000000..339631f06f00
 +	}
 +	*dst++ = '\0';
 +}
-diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
-new file mode 100644
-index 000000000000..a7eb760123bf
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
+diff -Naur linux-6.1.56.org/net/netfilter/xt_layer7.c linux-6.1.56/net/netfilter/xt_layer7.c
+--- linux-6.1.56.org/net/netfilter/xt_layer7.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-6.1.56/net/netfilter/xt_layer7.c	2023-10-07 14:14:11.098115909 +0200
 @@ -0,0 +1,666 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7) data in connections.