Merge branch 'users/jwiesner/SLE15-SP4/for-next' into SLE15-SP4

Pull a fix for zfcpdump build failure from Jiri Wiesner.

patches.suse/tcp-Add-a-stub-for-sk_defer_free_flush.patch

@@ -0,0 +1,52 @@
+From 48cec899e357cfb92d022a9c0df6bbe72a7f6951 Mon Sep 17 00:00:00 2001
+From: Gal Pressman <[email protected]>
+Date: Thu, 20 Jan 2022 14:34:40 +0200
+Subject: [PATCH] tcp: Add a stub for sk_defer_free_flush()
+Git-commit: 48cec899e357cfb92d022a9c0df6bbe72a7f6951
+Patch-mainline: v5.17-rc2
+References: bsc#1195400
+
+When compiling the kernel with CONFIG_INET disabled, the
+sk_defer_free_flush() should be defined as a nop.
+
+This resolves the following compilation error:
+ ld: net/core/sock.o: in function `sk_defer_free_flush':
+ ./include/net/tcp.h:1378: undefined reference to `__sk_defer_free_flush'
+
+Fixes: 79074a72d335 ("net: Flush deferred skb free on socket destroy")
+Reported-by: kernel test robot <[email protected]>
+Reviewed-by: Tariq Toukan <[email protected]>
+Signed-off-by: Gal Pressman <[email protected]>
+Reviewed-by: Eric Dumazet <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Jakub Kicinski <[email protected]>
+Signed-off-by: Jiri Wiesner <[email protected]>
+---
+ include/net/tcp.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/net/tcp.h b/include/net/tcp.h
+index 44e442bf23f9..b9fc978fb2ca 100644
+--- a/include/net/tcp.h
++++ b/include/net/tcp.h
+@@ -1369,6 +1369,7 @@ static inline bool tcp_checksum_complete(struct sk_buff *skb)
+
+ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb);
+
++#ifdef CONFIG_INET
+ void __sk_defer_free_flush(struct sock *sk);
+
+ static inline void sk_defer_free_flush(struct sock *sk)
+@@ -1377,6 +1378,9 @@ static inline void sk_defer_free_flush(struct sock *sk)
+ return;
+ __sk_defer_free_flush(sk);
+ }
++#else
++static inline void sk_defer_free_flush(struct sock *sk) {}
++#endif
+
+ int tcp_filter(struct sock *sk, struct sk_buff *skb);
+ void tcp_set_state(struct sock *sk, int state);
+-- 
+2.26.2
+

series.conf

@@ -8163,6 +8163,7 @@
  patches.suse/drm-vmwgfx-Fix-stale-file-descriptors-on-failed-user.patch
  patches.suse/net-phy-broadcom-hook-up-soft_reset-for-BCM54616S.patch
  patches.suse/phylib-fix-potential-use-after-free.patch
+ patches.suse/tcp-Add-a-stub-for-sk_defer_free_flush.patch
  patches.suse/tcp-add-a-missing-sk_defer_free_flush-in-tcp_splice_.patch
  patches.suse/ibmvnic-Allow-extra-failures-before-disabling.patch
  patches.suse/ibmvnic-init-running_cap_crqs-early.patch