public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-04 00:06:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/ethernet/freescale
History
Jakub Kicinski 8f674972d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/iavf/iavf_ethtool.c
  3a0b5a2929 ("iavf: Introduce new state machines for flow director")
  95260816b4 ("iavf: use iavf_schedule_aq_request() helper")
https://lore.kernel.org/all/84e12519-04dc-bd80-bc34-8cf50d7898ce@intel.com/

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  c13e268c07 ("bnxt_en: Fix HWTSTAMP_FILTER_ALL packet timestamp logic")
  c2f8063309 ("bnxt_en: Refactor RX VLAN acceleration logic.")
  a7445d6980 ("bnxt_en: Add support for new RX and TPA_START completion types for P7")
  1c7fd6ee2f ("bnxt_en: Rename some macros for the P5 chips")
https://lore.kernel.org/all/20231211110022.27926ad9@canb.auug.org.au/

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
  bd6781c18c ("bnxt_en: Fix wrong return value check in bnxt_close_nic()")
  84793a4995 ("bnxt_en: Skip nic close/open when configuring tstamp filters")
https://lore.kernel.org/all/20231214113041.3a0c003c@canb.auug.org.au/

drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
  3d7a3f2612 ("net/mlx5: Nack sync reset request when HotPlug is enabled")
  cecf44ea1a ("net/mlx5: Allow sync reset flow when BF MGT interface device is present")
https://lore.kernel.org/all/20231211110328.76c925af@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-12-14 17:14:41 -08:00
..
dpaa eth: dpaa: add missing net/xdp.h include 2023-08-03 16:17:34 -07:00
dpaa2 dpaa2-switch: do not ask for MDB, VLAN and FDB replay 2023-12-13 18:38:54 -08:00
enetc net: ethtool: pass a pointer to parameters to get/set_rxfh ethtool ops 2023-12-13 22:07:16 -08:00
fman net: fman: convert to .mac_get_caps() 2023-10-17 17:51:19 -07:00
fs_enet net: ethernet: Use device_get_match_data() 2023-10-13 10:04:53 +01:00
fec.h net: fec: improve XDP_TX performance 2023-08-16 07:12:39 +01:00
fec_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-12-14 17:14:41 -08:00
fec_mpc52xx.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
fec_mpc52xx.h
fec_mpc52xx_phy.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
fec_ptp.c net: fec: delete fec_ptp_disable_hwts() 2023-08-02 19:11:06 -07:00
fsl_pq_mdio.c net: ethernet: Use device_get_match_data() 2023-10-13 10:04:53 +01:00
gianfar.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
gianfar.h
gianfar_ethtool.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
Kconfig net: fec: allow to build without PAGE_POOL_STATS 2023-06-20 12:11:59 -07:00
Makefile
ucc_geth.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
ucc_geth.h
ucc_geth_ethtool.c
xgmac_mdio.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00