torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code
aea007741b
linux/drivers/net/ethernet/intel/e1000e
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
..
80003es2lan.c intel: legacy: field get conversion 2023-12-18 11:20:43 -08:00
80003es2lan.h
82571.c intel: legacy: field get conversion 2023-12-18 11:20:43 -08:00
82571.h
defines.h net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates 2024-05-08 09:26:46 -07:00
e1000.h e1000e: correct maximum frequency adjustment values 2024-01-29 10:01:08 -08:00
e1000e_trace.h e1000e: Add e1000e trace module 2022-11-02 11:08:38 -07:00
ethtool.c net: Add struct kernel_ethtool_ts_info 2024-07-15 08:02:26 -07:00
hw.h e1000e: change I219 (19) devices to ADP 2024-10-08 14:39:22 -07:00
ich8lan.c e1000e: Remove Meteor Lake SMBUS workarounds 2024-11-04 13:09:34 -08:00
ich8lan.h Revert "e1000e: Fix possible HW unit hang after an s0ix exit" 2022-07-14 09:17:21 -07:00
mac.c intel: legacy: field get conversion 2023-12-18 11:20:43 -08:00
mac.h net: e1000e: Remove unused declarations 2023-08-15 19:05:17 -07:00
Makefile net: intel: Use *-y instead of *-objs in Makefile 2024-06-10 19:52:44 -07:00
manage.c
manage.h
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-10-10 13:13:33 -07:00
nvm.c
nvm.h
param.c intel: remove unused macros 2022-06-30 09:40:55 -07:00
phy.c e1000e: change usleep_range to udelay in PHY mdic access 2024-04-30 18:40:59 -07:00
phy.h e1000e: Workaround for sporadic MDI error on Meteor Lake systems 2024-03-27 11:44:20 -07:00
ptp.c e1000e: Replace convert_art_to_tsc() 2024-06-03 11:18:50 +02:00
regs.h