public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 01:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/ethernet/xilinx
History
Jakub Kicinski 45c226dde7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  c9663f79cd ("ice: adjust switchdev rebuild path")
  7758017911 ("ice: restore timestamp configuration after device reset")
https://lore.kernel.org/all/20231121211259.3348630-1-anthony.l.nguyen@intel.com/

Adjacent changes:

kernel/bpf/verifier.c
  bb124da69c ("bpf: keep track of max number of bpf_loop callback iterations")
  5f99f312bd ("bpf: add register bounds sanity checks and sanitization")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-11-23 12:20:58 -08:00
..
Kconfig net: axienet: Introduce dmaengine support 2023-11-20 17:52:22 -08:00
ll_temac.h net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
ll_temac_main.c net: ethernet: xilinx: Convert to platform remove callback returning void 2023-09-20 09:06:41 +01:00
ll_temac_mdio.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
Makefile
xilinx_axienet.h net: axienet: Introduce dmaengine support 2023-11-20 17:52:22 -08:00
xilinx_axienet_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-11-23 12:20:58 -08:00
xilinx_axienet_mdio.c net: axienet: set mdio clock according to bus-frequency 2022-11-21 10:36:03 +00:00
xilinx_emaclite.c net: ethernet: xilinx: Drop kernel doc comment about return value 2023-10-01 14:00:27 +01:00