linux/drivers/net/dsa/qca
Jakub Kicinski d755d45bc0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes in preparation for the net-next PR.

Conflicts:

net/tls/tls_sw.c
  406e8a651a ("net: skmsg: preserve sg.copy across SG transforms")
  79511603a6 ("tls: remove dead sockmap (psock) handling from the SW path")

drivers/net/ethernet/microsoft/mana/mana_en.c
  f8fd56977e ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")
  d07efe5a6e ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")
https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-06-16 14:59:58 -07:00
..
ar9331.c net: Use dev_fwnode() 2025-06-12 18:46:37 -07:00
Kconfig net: dsa: qca8k: add CONFIG_LEDS_TRIGGERS dependency 2023-06-02 10:55:41 +01:00
Makefile net: dsa: qca8k: add LEDs basic support 2023-04-19 12:59:15 +01:00
qca8k_leds.h net: dsa: qca8k: add LEDs basic support 2023-04-19 12:59:15 +01:00
qca8k-8xxx.c net: dsa: qca8k: Add support for force mode for fixed link topology 2026-06-09 17:38:36 -07:00
qca8k-common.c net: dsa: qca: remove qca8k_get_mac_eee() 2025-01-07 18:06:18 -08:00
qca8k-leds.c net: dsa: qca8k: fix led devicename when using external mdio bus 2026-06-11 15:02:52 -07:00
qca8k.h net: dsa: qca8k: Add support for force mode for fixed link topology 2026-06-09 17:38:36 -07:00