Jakub Kicinski 35b1b1fd96 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: net/dsa/port.c 9945c1fb03 ("net: dsa: fix older DSA drivers using phylink") a88dd75384 ("net: dsa: remove legacy_pre_march2020 detection") https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/ net/xdp/xsk.c 3c5b4d69c3 ("net: annotate data-races around sk->sk_mark") b7f72a30e9 ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path") https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/ drivers/net/ethernet/broadcom/bnxt/bnxt.c 37b61cda9c ("bnxt: don't handle XDP in netpoll") 2b56b3d992 ("eth: bnxt: handle invalid Tx completions more gracefully") https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/ Adjacent changes: drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c 62da08331f ("net/mlx5e: Set proper IPsec source port in L4 selector") fbd517549c ("net/mlx5e: Add function to get IPsec offload namespace") drivers/net/ethernet/sfc/selftest.c 55c1528f9b ("sfc: fix field-spanning memcpy in selftest") ae9d445cd4 ("sfc: Miscellaneous comment removals") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-03 14:34:37 -07:00
..
bnxt_coredump.c	bnxt_en: use firmware provided max timeout for messages	2022-01-09 16:27:23 -08:00
bnxt_coredump.h	bnxt_en: move coredump functions into dedicated file	2021-10-29 12:13:05 +01:00
bnxt_dcb.c	eth: bnxt: fix one of the W=1 warnings about fortified memcpy()	2023-07-28 13:47:34 -07:00
bnxt_dcb.h	eth: bnxt: fix warning for define in struct_group	2023-07-28 13:47:34 -07:00
bnxt_debugfs.c
bnxt_debugfs.h
bnxt_devlink.c	devlink: remove devlink features	2023-01-30 08:37:46 +00:00
bnxt_devlink.h	bnxt: revert hastily merged uAPI aberrations	2022-03-09 19:55:00 -08:00
bnxt_dim.c
bnxt_ethtool.c	bnxt_en: Don't issue AP reset during ethtool's reset operation	2023-06-08 10:52:45 +02:00
bnxt_ethtool.h	bnxt_en: implement callbacks for devlink selftests	2022-07-28 21:56:53 -07:00
bnxt_fw_hdr.h
bnxt_hsi.h	RDMA/bnxt_re: Update HW interface headers	2023-04-04 09:17:21 +03:00
bnxt_hwrm.c	bnxt_en: fix the handling of PCIE-AER	2022-11-04 19:29:02 -07:00
bnxt_hwrm.h	bnxt_en: Increase firmware message response DMA wait time	2022-02-20 13:47:15 +00:00
bnxt_nvm_defs.h
bnxt_ptp.c	bnxt_en: Prevent kernel panic when receiving unexpected PHC_UPDATE event	2023-06-08 10:52:45 +02:00
bnxt_ptp.h	bnxt_en: Add a non-real time mode to access NIC clock	2022-11-08 12:39:02 +01:00
bnxt_sriov.c	bnxt_en: Allow to set switchdev mode without existing VFs	2023-04-13 11:04:51 +02:00
bnxt_sriov.h	ethernet: constify references to netdev->dev_addr in drivers	2021-10-14 09:22:11 -07:00
bnxt_tc.c	net: flow_dissector: Use 64bits for used_keys	2023-07-31 09:11:24 +01:00
bnxt_tc.h
bnxt_ulp.c	bnxt_en: Fix a possible NULL pointer dereference in unload path	2023-04-18 12:27:16 +02:00
bnxt_ulp.h	bnxt_en: Remove runtime interrupt vector allocation	2023-02-01 19:02:20 -08:00
bnxt_vfr.c	bnxt_en: Link representors to PCI device	2023-06-21 14:07:09 -07:00
bnxt_vfr.h	bnxt_en: Allow to set switchdev mode without existing VFs	2023-04-13 11:04:51 +02:00
bnxt_xdp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
bnxt_xdp.h	bnxt: don't handle XDP in netpoll	2023-07-31 14:28:39 -07:00
bnxt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
bnxt.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
Makefile	bnxt_en: move coredump functions into dedicated file	2021-10-29 12:13:05 +01:00