]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
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)
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:
1  2 
MAINTAINERS
drivers/net/ethernet/dlink/dl2k.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_ptp.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/netconsole.c
drivers/net/usb/lan78xx.c
include/net/sock.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge