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

Conflicts:

include/net/inet_sock.h
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  c274af2242 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/

Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8de ("bonding: fix macvlan over alb bond support")
  f11e5bd159 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-24 10:51:39 -07:00
..
i40e.h i40e: Remove unnecessary aer.h include 2023-03-08 23:34:39 -08:00
i40e_adminq.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_adminq.h i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_adminq_cmd.h i40e: allow toggling loopback mode via ndo_set_features callback 2022-12-12 15:24:47 -08:00
i40e_alloc.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_client.c i40e: use ERR_PTR error print in i40e messages 2023-02-09 08:35:53 -08:00
i40e_common.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_dcb.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_dcb.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_dcb_nl.c i40e: use ERR_PTR error print in i40e messages 2023-02-09 08:35:53 -08:00
i40e_ddp.c i40e: Replace one-element array with flex-array member in struct i40e_package_header 2023-08-10 07:32:41 -07:00
i40e_debugfs.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_devids.h i40e: Add basic support for I710 devices 2022-09-06 12:49:00 -07:00
i40e_diag.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_diag.h i40e: fix registers dump after run ethtool adapter self test 2023-03-29 21:47:31 -07:00
i40e_ethtool.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_hmc.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_hmc.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_lan_hmc.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_lan_hmc.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-24 10:51:39 -07:00
i40e_nvm.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-18 12:44:56 -07:00
i40e_osdep.h i40e: use int for i40e_status 2023-02-09 08:35:53 -08:00
i40e_prototype.h i40e: Remove unused function declarations 2023-08-08 14:56:12 -07:00
i40e_ptp.c i40e: remove i40e_status 2023-07-31 14:37:25 -07:00
i40e_register.h i40e: Fix dropped jumbo frames statistics 2022-06-30 13:09:00 -07:00
i40e_trace.h i40e: add xdp_buff to i40e_ring struct 2023-03-09 13:11:24 -08:00
i40e_txrx.c i40e: xsk: add RX multi-buffer support 2023-07-19 09:56:50 -07:00
i40e_txrx.h i40e: xsk: add RX multi-buffer support 2023-07-19 09:56:50 -07:00
i40e_txrx_common.h i40e, xsk: Terminate Rx side of NAPI when XSK Rx queue gets full 2022-04-15 21:10:41 +02:00
i40e_type.h i40e: Replace one-element array with flex-array member in struct i40e_profile_aq_section 2023-08-10 10:41:54 -07:00
i40e_virtchnl_pf.c virtchnl: fix fake 1-elem arrays for structures allocated as nents 2023-08-16 09:14:14 -07:00
i40e_virtchnl_pf.h virtchnl: i40e/iavf: rename iwarp to rdma 2023-01-25 08:55:19 -08:00
i40e_xsk.c i40e: xsk: add TX multi-buffer support 2023-07-19 09:56:50 -07:00
i40e_xsk.h i40e: Fix DMA mappings leak 2022-10-14 08:24:31 +01:00
Makefile i40e: Implement DDP support in i40e driver 2019-04-16 15:10:21 -07:00