]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: deeed35 ebd297a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 1 May 2025 22:11:17 +0000 (15:11 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 May 2025 22:11:38 +0000 (15:11 -0700)
commit337079d31fb160959f87d7aa22a85b123c500c48
treef32b3019ffb563257c1fc43159229adcb54cc549tree
parentdeeed351e982ac4d521598375b34b071304533b0commit | diff
parentebd297a2affadb6f6f4d2e5d975c1eda18ac762dcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe-desc.c diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igc/igc_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/microchip/lan743x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/rtase/rtase_main.c diff1 | diff2 | blob | history
drivers/ptp/ptp_ocp.c diff1 | diff2 | blob | history
net/ipv4/udp_offload.c diff1 | diff2 | blob | history
net/xdp/xsk_buff_pool.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.