3
0
Fork 0
forked from mirrors/linux
kernel/drivers/net/dsa/mv88e6xxx
Paolo Abeni 941defcea7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

tools/testing/selftests/drivers/net/ping.py
  75cc19c8ff ("selftests: drv-net: add xdp cases for ping.py")
  de94e86974 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/20250311115758.17a1d414@canb.auug.org.au/

net/core/devmem.c
  a70f891e0f ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
  1d22d3060b ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/20250313114929.43744df1@canb.auug.org.au/

Adjacent changes:

tools/testing/selftests/net/Makefile
  6f50175cca ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
  2e5584e0f9 ("selftests/net: expand cmsg_ipv6.sh with ipv4")

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  661958552e ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
  fe96d717d3 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2025-03-13 23:08:11 +01:00
..
chip.c net: dsa: mv88e6xxx: Verify after ATU Load ops 2025-03-07 19:36:33 -08:00
chip.h dsa: mv88e6xxx: Move available stats into info structure 2024-12-10 18:23:12 -08:00
devlink.c net: dsa: mv88e6xxx: Fix uninitialised err value 2024-10-11 15:43:24 -07:00
devlink.h
global1.c net: dsa: mv88e6xxx: Avoid EEPROM timeout without EEPROM on 88E6250-family switches 2024-04-25 11:24:07 +01:00
global1.h net: dsa: mv88e6xxx: Avoid EEPROM timeout without EEPROM on 88E6250-family switches 2024-04-25 11:24:07 +01:00
global1_atu.c net: dsa: mv88e6xxx: Fix out-of-bound access 2024-08-20 16:53:21 -07:00
global1_vtu.c net: dsa: mv88e6xxx: Add FID map cache 2024-10-08 15:30:55 -07:00
global2.c
global2.h
global2_avb.c
global2_scratch.c net: dsa: mv88e6xxx: Remove stale comment 2024-08-28 17:54:58 -07:00
hwtstamp.c net: Add struct kernel_ethtool_ts_info 2024-07-15 08:02:26 -07:00
hwtstamp.h net: Add struct kernel_ethtool_ts_info 2024-07-15 08:02:26 -07:00
Kconfig net: dsa: mv88e6xxx: Support LED control 2024-10-04 15:31:28 -07:00
leds.c net: dsa: mv88e6xxx: Support LED control 2024-10-04 15:31:28 -07:00
Makefile net: dsa: mv88e6xxx: Support LED control 2024-10-04 15:31:28 -07:00
pcs-639x.c net: remove phylink_pcs .neg_mode boolean 2025-02-14 17:09:50 -08:00
pcs-6185.c net: remove phylink_pcs .neg_mode boolean 2025-02-14 17:09:50 -08:00
pcs-6352.c net: remove phylink_pcs .neg_mode boolean 2025-02-14 17:09:50 -08:00
phy.c
phy.h
port.c dsa: Use str_enable_disable-like helpers 2025-01-20 09:23:25 +00:00
port.h net: dsa: mv88e6xxx: Support LED control 2024-10-04 15:31:28 -07:00
port_hidden.c
ptp.c net: dsa: mv88e6xxx: support 4000ps cycle counter period 2024-10-24 12:57:46 +02:00
ptp.h
serdes.c net: dsa: use ethtool string helpers 2024-11-03 10:36:34 -08:00
serdes.h net: dsa: use ethtool string helpers 2024-11-03 10:36:34 -08:00
smi.c
smi.h
switchdev.c
switchdev.h
trace.c
trace.h tracing/treewide: Remove second parameter of __assign_str() 2024-05-22 20:14:47 -04:00