projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
deeed35
ebd297a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 1 May 2025 22:11:17 +0000
(15:11 -0700)
committer
Jakub Kicinski
<kuba@kernel.org>
Thu, 1 May 2025 22:11:38 +0000
(15:11 -0700)
Cross-merge networking fixes after downstream PR (net-6.15-rc5).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
15 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/amd/xgbe/xgbe.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igc/igc_ptp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/microchip/lan743x_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/realtek/rtase/rtase_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ptp/ptp_ocp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/udp_offload.c
patch
|
diff1
|
diff2
|
blob
|
history
net/xdp/xsk_buff_pool.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
Simple merge
diff --cc
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
Simple merge
diff --cc
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge
diff --cc
drivers/net/ethernet/amd/xgbe/xgbe.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igc/igc_ptp.c
Simple merge
diff --cc
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
Simple merge
diff --cc
drivers/net/ethernet/microchip/lan743x_main.c
Simple merge
diff --cc
drivers/net/ethernet/realtek/rtase/rtase_main.c
Simple merge
diff --cc
drivers/ptp/ptp_ocp.c
Simple merge
diff --cc
net/ipv4/udp_offload.c
Simple merge
diff --cc
net/xdp/xsk_buff_pool.c
Simple merge