mirror_ubuntu-kernels/drivers/net/ethernet/intel
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
..
e1000 e1000: replace deprecated strncpy with strscpy 2023-10-18 18:10:17 -07:00
e1000e e1000e: Add support for the next LOM generation 2023-08-24 12:55:25 -07:00
fm10k fm10k: replace deprecated strncpy with strscpy 2023-10-18 18:10:17 -07:00
i40e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-11-23 12:20:58 -08:00
iavf iavf: delete the iavf client interface 2023-10-27 15:35:49 -07:00
ice Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-11-23 12:20:58 -08:00
idpf idpf: fix potential use-after-free in idpf_tso() 2023-11-06 17:24:37 -08:00
igb Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-10-26 13:46:28 -07:00
igbvf igbvf: replace deprecated strncpy with strscpy 2023-10-18 18:10:18 -07:00
igc igc: Add support for PTP .getcyclesx64() 2023-11-13 15:17:09 -08:00
ixgbe ixgbe: fix end of loop test in ixgbe_set_vf_macvlan() 2023-10-20 12:53:06 +01:00
ixgbevf ixgbevf: Remove unused function declarations 2023-08-04 18:03:00 -07:00
e100.c e100: replace deprecated strncpy with strscpy 2023-10-18 18:10:17 -07:00
Kconfig i40e: Add initial devlink support 2023-10-15 14:33:41 +01:00
Makefile idpf: add SRIOV support and other ndo_ops 2023-09-13 14:59:24 -07:00