torvalds-linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-15 11:03:02 +00:00

History

Jakub Kicinski 33e1b1b399 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>

2025-05-22 09:42:41 -07:00

Kconfig

…

Makefile

…

xdp_umem.c

xsk: Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len

2024-07-25 11:57:27 +02:00

xdp_umem.h

…

xsk_buff_pool.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net