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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dpll/dpll_core.c
Simple merge

diff --cc drivers/net/can/flexcan/flexcan-core.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.h
Simple merge

diff --cc net/batman-adv/bat_iv_ogm.c
Simple merge

diff --cc net/batman-adv/bat_v_ogm.c
Simple merge

diff --cc net/bluetooth/6lowpan.c
Simple merge

diff --cc net/can/af_can.c
Simple merge

diff --cc net/core/lwtunnel.c
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcpv6_offload.c
Simple merge

diff --cc net/xdp/xsk_buff_pool.c
Simple merge

diff --cc tools/testing/selftests/drivers/net/ping.py
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index f03a0399e7a3a04dee6f318cb656f8aaa10a35e5,8f32b4f01aee14abec4694a015558115df0d4acc..6d718b478ed83f57e4a4d9595dfe8ac5442e77c3
--- 1/tools/testing/selftests/net/Makefile
--- 2/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 b0d0eda829d08def833db63eebad6ef4feb28122,61e5116987f3edfa197d0fbceb3a70a9e9fb9802..130d532b7e67af5769ed3cc29e45e0554448c99d
--- 1/tools/testing/selftests/net/config
--- 2/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