git.kernel.dk Git - linux-block.git/commit

author	Paolo Abeni <pabeni@redhat.com>
	Thu, 20 Mar 2025 20:32:20 +0000 (21:32 +0100)
committer	Paolo Abeni <pabeni@redhat.com>
	Thu, 20 Mar 2025 20:38:01 +0000 (21:38 +0100)
commit	f4915933947c71f08ed1c5a6c9b4fdbe735e18cf
tree	ef92e639f397903c31edeefc7be8d6e617f8d163	tree
parent	6855b9be9cf70d3fd4b4b9a00696eae65335320c	commit \| diff
parent	5fc31936081919a8572a3d644f3fbb258038f337	commit \| diff

Merge git://git./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>

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan/flexcan-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/gdma_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/am65-cpsw-nuss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_iv_ogm.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_ogm.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/6lowpan.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/lwtunnel.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcpv6_offload.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk_buff_pool.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/ping.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dpll/dpll_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan/flexcan-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/gdma_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/am65-cpsw-nuss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_iv_ogm.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_ogm.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/6lowpan.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/lwtunnel.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcpv6_offload.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk_buff_pool.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/ping.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history