[PATCH] kernel: update to 5.15.59 - Development

6 Aug 2022

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
---
 config/kernel/kernel.config.aarch64-ipfire    |  2 +-
 config/kernel/kernel.config.armv6l-ipfire     |  2 +-
 config/kernel/kernel.config.x86_64-ipfire     |  2 +-
 config/rootfiles/common/x86_64/linux          |  3 +-
 lfs/linux                                     |  6 +-
 ...ayer7.patch => linux-5.15.59-layer7.patch} | 74 +++++++++----------
 6 files changed, 44 insertions(+), 45 deletions(-)
 rename src/patches/linux/{linux-5.15.46-layer7.patch => linux-5.15.59-layer7.patch} (94%)

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index af31c0c61..6a0ea681d 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 5.15.57-ipfire Kernel Configuration
+# Linux/arm64 5.15.59-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire
index e769ce32a..9d2776bd2 100644
--- a/config/kernel/kernel.config.armv6l-ipfire
+++ b/config/kernel/kernel.config.armv6l-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.57-ipfire Kernel Configuration
+# Linux/arm 5.15.59-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index c6b63411d..f58bf4b2f 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 5.15.57-ipfire Kernel Configuration
+# Linux/x86 5.15.59-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 88a4bb40d..1f7df2e2e 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -1360,6 +1360,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/espfix.h
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/exec.h
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/extable.h
+#lib/modules/KVER-ipfire/build/arch/x86/include/asm/extable_fixup_types.h
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/fb.h
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/fixmap.h
 #lib/modules/KVER-ipfire/build/arch/x86/include/asm/floppy.h
@@ -7213,7 +7214,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DRM_I915_USERFAULT_AUTOSUSPEND
 #lib/modules/KVER-ipfire/build/include/config/DRM_I915_USERPTR
 #lib/modules/KVER-ipfire/build/include/config/DRM_KMS_HELPER
-#lib/modules/KVER-ipfire/build/include/config/DRM_LEGACY
 #lib/modules/KVER-ipfire/build/include/config/DRM_MGAG200
 #lib/modules/KVER-ipfire/build/include/config/DRM_MIPI_DSI
 #lib/modules/KVER-ipfire/build/include/config/DRM_NOUVEAU
@@ -9245,7 +9245,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/NORTEL_HERMES
 #lib/modules/KVER-ipfire/build/include/config/NOUVEAU_DEBUG
 #lib/modules/KVER-ipfire/build/include/config/NOUVEAU_DEBUG_DEFAULT
-#lib/modules/KVER-ipfire/build/include/config/NOUVEAU_LEGACY_CTX_SUPPORT
 #lib/modules/KVER-ipfire/build/include/config/NOZOMI
 #lib/modules/KVER-ipfire/build/include/config/NO_HZ
 #lib/modules/KVER-ipfire/build/include/config/NO_HZ_COMMON
diff --git a/lfs/linux b/lfs/linux
index 07e838933..e80f99601 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER         = 5.15.57
+VER         = 5.15.59
 ARM_PATCHES = 5.15-ipfire5
THISAPP    = linux-$(VER)
@@ -78,7 +78,7 @@ objects =$(DL_FILE) \
 $(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 = 9adea6b8ee97ead38ecab39b1ef08b2ee1647eebbb2a8ccd2ba253eeebfd6435c83a03e83e186809473a982a373185874c0082aa0c56f5928d304c7df56dfb86
+$(DL_FILE)_BLAKE2 = c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0
install : $(TARGET)
@@ -116,7 +116,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-5.15.46-layer7.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.59-layer7.patch
# DVB Patches
    cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
diff --git a/src/patches/linux/linux-5.15.46-layer7.patch b/src/patches/linux/linux-5.15.59-layer7.patch
similarity index 94%
rename from src/patches/linux/linux-5.15.46-layer7.patch
rename to src/patches/linux/linux-5.15.59-layer7.patch
index d6b46142c..f02a852a6 100644
--- a/src/patches/linux/linux-5.15.46-layer7.patch
+++ b/src/patches/linux/linux-5.15.59-layer7.patch
@@ -1,7 +1,7 @@
-diff -Naur linux-5.15.46.orig/include/linux/skbuff.h linux-5.15.46/include/linux/skbuff.h
---- linux-5.15.46.orig/include/linux/skbuff.h	2022-06-11 14:51:47.639775333 +0000
-+++ linux-5.15.46/include/linux/skbuff.h	2022-06-11 14:53:07.977494189 +0000
-@@ -772,6 +772,9 @@
+diff -Naur linux-5.15.59.ORG/include/linux/skbuff.h linux-5.15.59/include/linux/skbuff.h
+--- linux-5.15.59.ORG/include/linux/skbuff.h	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/include/linux/skbuff.h	2022-08-05 13:28:29.785231584 +0200
+@@ -807,6 +807,9 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
    unsigned long		 _nfct;
  #endif
@@ -11,9 +11,9 @@ diff -Naur linux-5.15.46.orig/include/linux/skbuff.h linux-5.15.46/include/linux
    unsigned int		len,
    			data_len;
    __u16			mac_len,
-diff -Naur linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h linux-5.15.46/include/net/netfilter/nf_conntrack.h
---- linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h	2022-06-11 14:51:48.471834543 +0000
-+++ linux-5.15.46/include/net/netfilter/nf_conntrack.h	2022-06-11 14:53:07.977494189 +0000
+diff -Naur linux-5.15.59.ORG/include/net/netfilter/nf_conntrack.h linux-5.15.59/include/net/netfilter/nf_conntrack.h
+--- linux-5.15.59.ORG/include/net/netfilter/nf_conntrack.h	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/include/net/netfilter/nf_conntrack.h	2022-08-05 13:28:29.786231577 +0200
 @@ -119,6 +119,23 @@
    /* Extensions */
    struct nf_ct_ext *ext;
@@ -38,9 +38,9 @@ diff -Naur linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h linux-5.15.46
    /* Storage reserved for other modules, must be the last member */
    union nf_conntrack_proto proto;
  };
-diff -Naur linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h linux-5.15.46/include/uapi/linux/netfilter/xt_layer7.h
---- linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/include/uapi/linux/netfilter/xt_layer7.h	2022-06-11 14:53:07.977494189 +0000
+diff -Naur linux-5.15.59.ORG/include/uapi/linux/netfilter/xt_layer7.h linux-5.15.59/include/uapi/linux/netfilter/xt_layer7.h
+--- linux-5.15.59.ORG/include/uapi/linux/netfilter/xt_layer7.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/include/uapi/linux/netfilter/xt_layer7.h	2022-08-05 13:28:29.786231577 +0200
 @@ -0,0 +1,13 @@
 +#ifndef _XT_LAYER7_H
 +#define _XT_LAYER7_H
@@ -55,9 +55,9 @@ diff -Naur linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h linux-5.1
 +};
 +
 +#endif /* _XT_LAYER7_H */
-diff -Naur linux-5.15.46.orig/net/netfilter/Kconfig linux-5.15.46/net/netfilter/Kconfig
---- linux-5.15.46.orig/net/netfilter/Kconfig	2022-06-11 14:51:48.599843652 +0000
-+++ linux-5.15.46/net/netfilter/Kconfig	2022-06-11 14:53:07.977494189 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/Kconfig linux-5.15.59/net/netfilter/Kconfig
+--- linux-5.15.59.ORG/net/netfilter/Kconfig	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/net/netfilter/Kconfig	2022-08-05 13:28:29.786231577 +0200
 @@ -1389,6 +1389,26 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -85,9 +85,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/Kconfig linux-5.15.46/net/netfilter/
  config NETFILTER_XT_MATCH_LENGTH
    tristate '"length" match support'
    depends on NETFILTER_ADVANCED
-diff -Naur linux-5.15.46.orig/net/netfilter/Makefile linux-5.15.46/net/netfilter/Makefile
---- linux-5.15.46.orig/net/netfilter/Makefile	2022-06-11 14:51:48.599843652 +0000
-+++ linux-5.15.46/net/netfilter/Makefile	2022-06-11 14:53:07.981494474 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/Makefile linux-5.15.59/net/netfilter/Makefile
+--- linux-5.15.59.ORG/net/netfilter/Makefile	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/net/netfilter/Makefile	2022-08-05 13:28:29.786231577 +0200
 @@ -201,6 +201,7 @@
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
@@ -96,9 +96,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/Makefile linux-5.15.46/net/netfilter
  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 -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c linux-5.15.46/net/netfilter/nf_conntrack_core.c
---- linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c	2022-06-11 14:51:48.599843652 +0000
-+++ linux-5.15.46/net/netfilter/nf_conntrack_core.c	2022-06-11 14:53:07.981494474 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/nf_conntrack_core.c linux-5.15.59/net/netfilter/nf_conntrack_core.c
+--- linux-5.15.59.ORG/net/netfilter/nf_conntrack_core.c	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/net/netfilter/nf_conntrack_core.c	2022-08-05 13:28:29.787231570 +0200
 @@ -648,6 +648,11 @@
     */
    nf_ct_remove_expectations(ct);
@@ -111,9 +111,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c linux-5.15.46/ne
    nf_ct_del_from_dying_or_unconfirmed_list(ct);
local_bh_enable();
-diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c linux-5.15.46/net/netfilter/nf_conntrack_standalone.c
---- linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c	2022-06-11 14:51:48.603843938 +0000
-+++ linux-5.15.46/net/netfilter/nf_conntrack_standalone.c	2022-06-11 14:54:23.322859367 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/nf_conntrack_standalone.c linux-5.15.59/net/netfilter/nf_conntrack_standalone.c
+--- linux-5.15.59.ORG/net/netfilter/nf_conntrack_standalone.c	2022-08-03 12:03:56.000000000 +0200
++++ linux-5.15.59/net/netfilter/nf_conntrack_standalone.c	2022-08-05 13:28:29.787231570 +0200
 @@ -370,6 +370,11 @@
    ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
    ct_show_delta_time(s, ct);
@@ -126,9 +126,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c linux-5.15
    seq_printf(s, "use=%u\n", refcount_read(&ct->ct_general.use));
if (seq_has_overflowed(s))
-diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.c linux-5.15.46/net/netfilter/regexp/regexp.c
---- linux-5.15.46.orig/net/netfilter/regexp/regexp.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/net/netfilter/regexp/regexp.c	2022-06-11 14:53:07.985494758 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/regexp/regexp.c linux-5.15.59/net/netfilter/regexp/regexp.c
+--- linux-5.15.59.ORG/net/netfilter/regexp/regexp.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/net/netfilter/regexp/regexp.c	2022-08-05 13:28:29.788231563 +0200
 @@ -0,0 +1,1197 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1327,9 +1327,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.c linux-5.15.46/net/ne
 +#endif
 +
 +
-diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.h linux-5.15.46/net/netfilter/regexp/regexp.h
---- linux-5.15.46.orig/net/netfilter/regexp/regexp.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/net/netfilter/regexp/regexp.h	2022-06-11 14:53:07.985494758 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/regexp/regexp.h linux-5.15.59/net/netfilter/regexp/regexp.h
+--- linux-5.15.59.ORG/net/netfilter/regexp/regexp.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/net/netfilter/regexp/regexp.h	2022-08-05 13:28:29.788231563 +0200
 @@ -0,0 +1,41 @@
 +/*
 + * Definitions etc. for regexp(3) routines.
@@ -1372,18 +1372,18 @@ diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.h linux-5.15.46/net/ne
 +void regerror(char *s);
 +
 +#endif
-diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regmagic.h linux-5.15.46/net/netfilter/regexp/regmagic.h
---- linux-5.15.46.orig/net/netfilter/regexp/regmagic.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/net/netfilter/regexp/regmagic.h	2022-06-11 14:53:07.985494758 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/regexp/regmagic.h linux-5.15.59/net/netfilter/regexp/regmagic.h
+--- linux-5.15.59.ORG/net/netfilter/regexp/regmagic.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/net/netfilter/regexp/regmagic.h	2022-08-05 13:28:29.788231563 +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 -Naur linux-5.15.46.orig/net/netfilter/regexp/regsub.c linux-5.15.46/net/netfilter/regexp/regsub.c
---- linux-5.15.46.orig/net/netfilter/regexp/regsub.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/net/netfilter/regexp/regsub.c	2022-06-11 14:53:07.985494758 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/regexp/regsub.c linux-5.15.59/net/netfilter/regexp/regsub.c
+--- linux-5.15.59.ORG/net/netfilter/regexp/regsub.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/net/netfilter/regexp/regsub.c	2022-08-05 13:28:29.788231563 +0200
 @@ -0,0 +1,95 @@
 +/*
 + * regsub
@@ -1480,9 +1480,9 @@ diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regsub.c linux-5.15.46/net/ne
 +	}
 +	*dst++ = '\0';
 +}
-diff -Naur linux-5.15.46.orig/net/netfilter/xt_layer7.c linux-5.15.46/net/netfilter/xt_layer7.c
---- linux-5.15.46.orig/net/netfilter/xt_layer7.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.15.46/net/netfilter/xt_layer7.c	2022-06-11 14:53:07.985494758 +0000
+diff -Naur linux-5.15.59.ORG/net/netfilter/xt_layer7.c linux-5.15.59/net/netfilter/xt_layer7.c
+--- linux-5.15.59.ORG/net/netfilter/xt_layer7.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-5.15.59/net/netfilter/xt_layer7.c	2022-08-05 13:28:29.788231563 +0200
 @@ -0,0 +1,666 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7) data in connections.
-- 
2.36.1


    