From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 13 Apr 2023 23:04:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=800e68c44ffe71f9715f745b38fd1af6910b3773;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

Conflicts:

tools/testing/selftests/net/config
  62199e3f1658 ("selftests: net: Add VXLAN MDB test")
  3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

800e68c44ffe71f9715f745b38fd1af6910b3773
diff --cc tools/testing/selftests/net/config
index 4c7ce07afa2f9,2529226ce87ca..d1d421ec10a30
--- a/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@@ -48,4 -48,4 +48,5 @@@ CONFIG_BAREUDP=
  CONFIG_IPV6_IOAM6_LWTUNNEL=y
  CONFIG_CRYPTO_SM4_GENERIC=y
  CONFIG_AMT=m
 +CONFIG_VXLAN=m
+ CONFIG_IP_SCTP=m