2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
linux/drivers/net/pcs
Jakub Kicinski 2ee738e90e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.13-rc8).

Conflicts:

drivers/net/ethernet/realtek/r8169_main.c
  1f691a1fc4 ("r8169: remove redundant hwmon support")
  152d00a913 ("r8169: simplify setting hwmon attribute visibility")
https://lore.kernel.org/20250115122152.760b4e8d@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  152f4da05a ("bnxt_en: add support for rx-copybreak ethtool command")
  f0aa6a37a3 ("eth: bnxt: always recalculate features after XDP clearing, fix null-deref")

drivers/net/ethernet/intel/ice/ice_type.h
  50327223a8 ("ice: add lock to protect low latency interface")
  dc26548d72 ("ice: Fix quad registers read on E825")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-16 10:34:59 -08:00
..
Kconfig net: pcs: xpcs: Add Synopsys DW xPCS platform device driver 2024-07-05 09:35:50 +01:00
Makefile net: pcs: xpcs: Add Synopsys DW xPCS platform device driver 2024-07-05 09:35:50 +01:00
pcs-lynx.c net: phylink: pass neg_mode into c22 state decoder 2025-01-15 13:23:30 -08:00
pcs-mtk-lynxi.c net: phylink: pass neg_mode into c22 state decoder 2025-01-15 13:23:30 -08:00
pcs-rzn1-miic.c net: Switch back to struct platform_driver::remove() 2024-10-04 16:39:57 -07:00
pcs-xpcs-nxp.c net: pcs: xpcs: add _modify() accessors 2024-10-09 12:13:11 +01:00
pcs-xpcs-plat.c net: pcs: xpcs: Add Synopsys DW xPCS platform device driver 2024-07-05 09:35:50 +01:00
pcs-xpcs-wx.c net: pcs: xpcs: add _modify() accessors 2024-10-09 12:13:11 +01:00
pcs-xpcs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-01-16 10:34:59 -08:00
pcs-xpcs.h net: pcs: xpcs: use generic register definitions 2024-10-23 16:10:16 +02:00