projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d6d67c 27605c8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 Jun 2025 17:09:10 +0000 (10:09 -0700)
commit535de528015b56e34a40a8e1eb1629fadf809a84
treef0287cdc9d13798b0e723541f51d1dfd8c99c50ctree
parent5d6d67c4cb10a4b4d3ae35758d5eeed6239afdc8commit | diff
parent27605c8c0f69e319df156b471974e4e223035378commit | diff
Merge git://git./linux/kernel/git/netdev/net

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

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/dlink/dl2k.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/iavf/iavf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/netconsole.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)