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
0d60fd5032
linux/drivers/net/ethernet/freescale
History
Jakub Kicinski 357660d759 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR (net-6.14-rc5).

Conflicts:

drivers/net/ethernet/cadence/macb_main.c
  fa52f15c74 ("net: cadence: macb: Synchronize stats calculations")
  75696dd0fd ("net: cadence: macb: Convert to get_stats64")
https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_sriov.c
  79990cf5e7 ("ice: Fix deinitializing VF in error path")
  a203163274 ("ice: simplify VF MSI-X managing")

net/ipv4/tcp.c
  18912c5206 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace")
  297d389e9e ("net: prefix devmem specific helpers")

net/mptcp/subflow.c
  8668860b0a ("mptcp: reset when MPTCP opts are dropped after join")
  c3349a22c2 ("mptcp: consolidate subflow cleanup")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-02-27 10:20:58 -08:00
..
dpaa xdp: get rid of xdp_frame::mem.id 2024-12-12 18:22:52 -08:00
dpaa2 rtnetlink: add ndo_fdb_dump_context 2024-12-10 18:32:32 -08:00
enetc net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() 2025-02-25 19:10:59 -08:00
fman net: remove phylink_pcs .neg_mode boolean 2025-02-14 17:09:50 -08:00
fs_enet net: ethernet: fs_enet: Use %pa to format resource_size_t 2024-10-15 10:55:54 -07:00
fec_main.c net: fec: Refactor MAC reset to function 2025-02-11 10:55:25 +01:00
fec_mpc52xx_phy.c net: fec_mpc52xx_phy: Use %pa to format resource_size_t 2024-10-15 10:55:54 -07:00
fec_mpc52xx.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00
fec_mpc52xx.h
fec_ptp.c net: fec: make PPS channel configurable 2024-10-08 12:29:34 +02:00
fec.h net: fec: use phydev->eee_cfg.tx_lpi_timer 2024-12-11 20:23:52 -08:00
fsl_pq_mdio.c net: ethernet: Switch back to struct platform_driver::remove() 2024-10-04 16:39:56 -07:00
gianfar_ethtool.c net: freescale: use ethtool string helpers 2024-10-31 18:34:48 -07:00
gianfar.c net: gianfar: simplify init_phy() 2025-02-07 17:01:01 -08:00
gianfar.h
Kconfig net: freescale: ucc_geth: phylink conversion 2024-12-06 13:41:53 +00:00
Makefile
ucc_geth_ethtool.c net: freescale: ucc_geth: phylink conversion 2024-12-06 13:41:53 +00:00
ucc_geth.c net: freescale: ucc_geth: make ugeth_mac_ops be static const 2025-02-18 18:08:18 -08:00
ucc_geth.h net: freescale: ucc_geth: remove unused PHY_INIT_TIMEOUT and PHY_CHANGE_TIME 2025-02-11 16:34:58 -08:00
xgmac_mdio.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00