mirror_ubuntu-kernels/drivers/net/pcs
Jakub Kicinski 7ff57803d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e1949 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88a ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-18 12:44:56 -07:00
..
Kconfig net: pcs: Drop the TSE PCS driver 2023-06-05 09:56:36 +01:00
Makefile net: pcs: Drop the TSE PCS driver 2023-06-05 09:56:36 +01:00
pcs-lynx.c net: pcs: lynx: fix lynx_pcs_link_up_sgmii() not doing anything in fixed-link mode 2023-08-13 12:32:44 +01:00
pcs-mtk-lynxi.c net: pcs: lynxi: update PCS driver to use neg_mode 2023-06-22 19:41:01 -07:00
pcs-rzn1-miic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-18 12:44:56 -07:00
pcs-xpcs-nxp.c net: update NXP copyright text 2021-09-17 13:52:17 +01:00
pcs-xpcs.c net: pcs: xpcs: update PCS driver to use neg_mode 2023-06-22 19:41:01 -07:00
pcs-xpcs.h net: pcs: xpcs: clean up reading clause 73 link partner advertisement 2023-05-24 09:13:22 -07:00