projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d6d67c
27605c8
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000
(10:08 -0700)
committer
Jakub 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
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/dlink/dl2k.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/i40e/i40e_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/iavf/iavf_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_ptp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netconsole.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/lan78xx.c
patch
|
diff1
|
diff2
|
blob
|
history
include/net/sock.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/dlink/dl2k.c
Simple merge
diff --cc
drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge
diff --cc
drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge
diff --cc
drivers/net/netconsole.c
Simple merge
diff --cc
drivers/net/usb/lan78xx.c
Simple merge
diff --cc
include/net/sock.h
Simple merge