]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ccf3f4 5cdb2c7)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 22 May 2025 16:42:41 +0000 (09:42 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 May 2025 16:42:41 +0000 (09:42 -0700)
commit33e1b1b3991ba8c0d02b2324a582e084272205d6
tree825acc434f186a95f35446afeccfc80f92c4e4cftree
parent3ccf3f441f93f18edbd482d2ef606e5153c5542ccommit | diff
parent5cdb2c77c4c3d36bdee83d9231649941157f8204commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.15-rc8).

Conflicts:
  80f2ab46c2ee ("irdma: free iwdev->rf after removing MSI-X")
  4bcc063939a5 ("ice, irdma: fix an off by one in error handling code")
  c24a65b6a27c ("iidc/ice/irdma: Update IDC to support multiple consumers")
https://lore.kernel.org/20250513130630.280ee6c5@canb.auug.org.au

No extra adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/hw/irdma/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/airoha/airoha_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_virtchnl.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/idpf/idpf.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/idpf/idpf_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/idpf/idpf_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c diff1 | diff2 | blob | history
drivers/net/ethernet/microchip/lan743x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/am65-cpsw-nuss.c diff1 | diff2 | blob | history
drivers/ptp/ptp_ocp.c diff1 | diff2 | blob | history
include/net/netdev_lock.h diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/ipv4/ipmr.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.