Commit 8b5a19b4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR (net-6.16-rc8).

Conflicts:

drivers/net/ethernet/microsoft/mana/gdma_main.c
  9669ddda ("net: mana: Fix warnings for missing export.h header inclusion")
  75539112 ("net: mana: Allocate MSI-X vectors dynamically")
https://lore.kernel.org/20250711130752.23023d98@canb.auug.org.au



Adjacent changes:

drivers/net/ethernet/ti/icssg/icssg_prueth.h
  6e86fb73 ("net: ti: icssg-prueth: Fix buffer allocation for ICSSG")
  ffe8a490 ("net: ti: icssg-prueth: Read firmware-names from device tree")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 94619ea2 407c114c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment