From eddceca1f06855a3db399817621d58d5cb4ddc1c Mon Sep 17 00:00:00 2001 From: Juergen Gross <jgross@suse.com> Date: Jun 03 2025 05:38:19 +0000 Subject: Merge branch users/pfalcato/SLE15-SP7/for-next into SLE15-SP7 --- diff --git a/patches.kabi/ipv4-icmp-Unmask-upper-DSCP-bits-in-icmp_route_looku.patch b/patches.kabi/ipv4-icmp-Unmask-upper-DSCP-bits-in-icmp_route_looku.patch deleted file mode 100644 index e7bcd7e..0000000 --- a/patches.kabi/ipv4-icmp-Unmask-upper-DSCP-bits-in-icmp_route_looku.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Pedro Falcato <pfalcato@suse.de> -Date: Mon May 5 12:53:58 2025 +0100 -Patch-mainline: Never, kABI workaround -References: git-fixes -Subject: [PATCH] Kabi workaround for icmp: Unmask upper DSCP bits in icmp_route_lookup() -Signed-off-by: Pedro Falcato <pfalcato@suse.de> ---- - net/ipv4/icmp.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/ipv4/icmp.c -+++ b/net/ipv4/icmp.c -@@ -92,7 +92,9 @@ - #include <net/ip_fib.h> - #include <net/l3mdev.h> - #include <net/addrconf.h> -+#ifndef __GENKSYMS__ - #include <net/inet_dscp.h> -+#endif - /* - * Build xmit assembly blocks - */ diff --git a/series.conf b/series.conf index 4500af6..30778aa 100644 --- a/series.conf +++ b/series.conf @@ -53035,7 +53035,6 @@ patches.kabi/kabi-perf-Fix-hang-while-freeing-sigtrap-event.patch patches.kabi/kabi-perf-aux-Fix-AUX-buffer-serialization.patch patches.kabi/struct-typec_port-move-nre-mutex-to-end.patch - patches.kabi/ipv4-icmp-Unmask-upper-DSCP-bits-in-icmp_route_looku.patch patches.kabi/kabi-fix-kabi-for-its.patch ########################################################