Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/hisilicon
History
Jakub Kicinski 2696e451df Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR (net-6.12-rc7).

Conflicts:

drivers/net/ethernet/freescale/enetc/enetc_pf.c
  e15c5506dd ("net: enetc: allocate vf_state during PF probes")
  3774409fd4 ("net: enetc: build enetc_pf_common.c as a separate module")
https://lore.kernel.org/20241105114100.118bd35e@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/ti/am65-cpsw-nuss.c
  de794169cf ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7")
  4a7b2ba94a ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 		2024-11-07 13:44:16 -08:00
..
hibmcge net: hibmcge: Add a Makefile and update Kconfig for hibmcge 2024-10-21 11:26:53 +02:00
hns net: hisilicon: hns: use ethtool string helpers 2024-11-05 17:38:29 -08:00
hns3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-11-07 13:44:16 -08:00
Kconfig net: hibmcge: Add a Makefile and update Kconfig for hibmcge 2024-10-21 11:26:53 +02:00
Makefile net: hibmcge: Add a Makefile and update Kconfig for hibmcge 2024-10-21 11:26:53 +02:00
hip04_eth.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00
hisi_femac.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00
hix5hd2_gmac.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00
hns_mdio.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00