From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 20 Mar 2025 20:32:20 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.15-rc1~160^2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4915933947c71f08ed1c5a6c9b4fdbe735e18cf;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.14-rc8).

Conflict:

tools/testing/selftests/net/Makefile
  03544faad761 ("selftest: net: add proc_net_pktgen")
  3ed61b8938c6 ("selftests: net: test for lwtunnel dst ref loops")

tools/testing/selftests/net/config:
  85cb3711acb8 ("selftests: net: Add test cases for link and peer netns")
  3ed61b8938c6 ("selftests: net: test for lwtunnel dst ref loops")

Adjacent commits:

tools/testing/selftests/net/Makefile
  c935af429ec2 ("selftests: net: add support for testing SO_RCVMARK and SO_RCVPRIORITY")
  355d940f4d5a ("Revert "selftests: Add IPv6 link-local address generation tests for GRE devices."")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

f4915933947c71f08ed1c5a6c9b4fdbe735e18cf
diff --cc tools/testing/selftests/net/Makefile
index f03a0399e7a3a,8f32b4f01aee1..6d718b478ed83
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -31,15 -31,11 +31,14 @@@ TEST_PROGS += veth.s
  TEST_PROGS += ioam6.sh
  TEST_PROGS += gro.sh
  TEST_PROGS += gre_gso.sh
- TEST_PROGS += gre_ipv6_lladdr.sh
  TEST_PROGS += cmsg_so_mark.sh
  TEST_PROGS += cmsg_so_priority.sh
 -TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh
 +TEST_PROGS += test_so_rcv.sh
 +TEST_PROGS += cmsg_time.sh cmsg_ip.sh
  TEST_PROGS += netns-name.sh
 +TEST_PROGS += link_netns.py
  TEST_PROGS += nl_netdev.py
 +TEST_PROGS += rtnetlink.py
  TEST_PROGS += srv6_end_dt46_l3vpn_test.sh
  TEST_PROGS += srv6_end_dt4_l3vpn_test.sh
  TEST_PROGS += srv6_end_dt6_l3vpn_test.sh
@@@ -105,7 -100,7 +104,8 @@@ TEST_PROGS += vlan_bridge_binding.s
  TEST_PROGS += bpf_offload.py
  TEST_PROGS += ipv6_route_update_soft_lockup.sh
  TEST_PROGS += busy_poll_test.sh
 +TEST_GEN_PROGS += proc_net_pktgen
+ TEST_PROGS += lwt_dst_cache_ref_loop.sh
  
  # YNL files, must be before "include ..lib.mk"
  YNL_GEN_FILES := busy_poller netlink-dumps
diff --cc tools/testing/selftests/net/config
index b0d0eda829d08,61e5116987f3e..130d532b7e67a
--- a/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@@ -109,9 -107,5 +109,11 @@@ CONFIG_XFRM_INTERFACE=
  CONFIG_XFRM_USER=m
  CONFIG_IP_NF_MATCH_RPFILTER=m
  CONFIG_IP6_NF_MATCH_RPFILTER=m
 +CONFIG_IPVLAN=m
 +CONFIG_CAN=m
 +CONFIG_CAN_DEV=m
 +CONFIG_CAN_VXCAN=m
 +CONFIG_NETKIT=y
 +CONFIG_NET_PKTGEN=m
+ CONFIG_IPV6_ILA=m
+ CONFIG_IPV6_RPL_LWTUNNEL=y