1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/intel/i40e
Jakub Kicinski ec4c20ca09 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

net/mac80211/rx.c
  91535613b6 ("wifi: mac80211: don't drop all unprotected public action frames")
  6c02fab724 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")

Adjacent changes:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c
  61471264c0 ("net: ethernet: apm: Convert to platform remove callback returning void")
  d2ca43f306 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")

net/vmw_vsock/virtio_transport.c
  64c99d2d6a ("vsock/virtio: support to send non-linear skb")
  53b08c4985 ("vsock/virtio: initialize the_virtio_vsock before using VQs")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-10-26 13:46:28 -07:00
..
i40e.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-10-26 13:46:28 -07:00
i40e_adminq.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_adminq.h i40e: Split i40e_osdep.h 2023-10-05 09:13:43 -07:00
i40e_adminq_cmd.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_alloc.h i40e: Move memory allocation structures to i40e_alloc.h 2023-10-05 09:13:42 -07:00
i40e_client.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-10-19 13:29:01 -07:00
i40e_dcb.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_dcb.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_dcb_nl.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_ddp.c i40e: use scnprintf over strncpy+strncat 2023-10-18 18:10:17 -07:00
i40e_debug.h i40e: Split i40e_osdep.h 2023-10-05 09:13:43 -07:00
i40e_debugfs.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_devids.h i40e: Add basic support for I710 devices 2022-09-06 12:49:00 -07:00
i40e_devlink.c i40e: Align devlink info versions with ice driver and add docs 2023-10-19 09:03:56 -07:00
i40e_devlink.h i40e: Add initial devlink support 2023-10-15 14:33:41 +01:00
i40e_diag.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_diag.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_ethtool.c intel: fix format warnings 2023-10-18 18:10:17 -07:00
i40e_hmc.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_hmc.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_io.h i40e: Split i40e_osdep.h 2023-10-05 09:13:43 -07:00
i40e_lan_hmc.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_lan_hmc.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_main.c i40e: Refactor and rename i40e_read_pba_string() 2023-10-15 14:33:41 +01:00
i40e_nvm.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_prototype.h i40e: Refactor and rename i40e_read_pba_string() 2023-10-15 14:33:41 +01:00
i40e_ptp.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_register.h i40e: Refactor I40E_MDIO_CLAUSE* macros 2023-10-05 09:13:42 -07:00
i40e_trace.h i40e: add xdp_buff to i40e_ring struct 2023-03-09 13:11:24 -08:00
i40e_txrx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-10-26 13:46:28 -07:00
i40e_txrx.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_txrx_common.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_type.h i40e: Refactor and rename i40e_read_pba_string() 2023-10-15 14:33:41 +01:00
i40e_virtchnl_pf.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_virtchnl_pf.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_xsk.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-10-26 13:46:28 -07:00
i40e_xsk.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
Makefile i40e: Add initial devlink support 2023-10-15 14:33:41 +01:00