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

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 10 Apr 2025 23:49:17 +0000 (16:49 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 10 Apr 2025 23:51:07 +0000 (16:51 -0700)
commit	cb7103298d1c5d8f71aa79283b64ca01c30264c7
tree	ce77754286d5a0ccbcaf92c47db1063a80745252	tree
parent	a9843689e2de1a3727d58b4225e4f8664937aefd	commit \| diff
parent	ab59a8605604f71bbbc16077270dc3f39648b7fc	commit \| diff

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

Cross-merge networking fixes after downstream PR (net-6.15-rc2).

Conflict:

Documentation/networking/netdevices.rst
net/core/lock_debug.c
04efcee6ef8d ("net: hold instance lock during NETDEV_CHANGE")
03df156dd3a6 ("xdp: double protect netdev->xdp_flags with netdev->lock")

No adjacent changes.

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

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

RSS Atom

Documentation/networking/netdevices.rst	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/google/gve/gve_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker_ofdpa.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_type.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/lock_debug.c	diff1 \|	diff2 \|	blob \| history