Jakub Kicinski a03a91bd68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. No conflicts. Adjacent changes: drivers/net/ethernet/sfc/tc.c 622ab65634 ("sfc: fix error unwinds in TC offload") b6583d5e9e ("sfc: support TC decap rules matching on enc_src_port") net/mptcp/protocol.c 5b825727d0 ("mptcp: add annotations around msk->subflow accesses") e76c8ef5cc ("mptcp: refactor mptcp_stream_accept()") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-06-01 15:38:26 -07:00
..
falcon	sfc: falcon: Drop redundant pci_enable_pcie_error_reporting()	2023-03-08 23:34:39 -08:00
siena	sfc/siena: Drop redundant pci_enable_pcie_error_reporting()	2023-03-08 23:34:39 -08:00
bitfield.h
ef10_regs.h
ef10_sriov.c	sfc: move table locking into filter_table_{probe,remove} methods	2022-07-29 21:22:06 -07:00
ef10_sriov.h
ef10.c	sfc: ef10: don't overwrite offload features at NIC reset	2023-03-24 14:48:17 -07:00
ef100_ethtool.c	sfc: remove 'log-tc-errors' ethtool private flag	2022-10-19 13:00:05 -07:00
ef100_ethtool.h
ef100_netdev.c	sfc: handle VI shortage on ef100 by readjusting the channels	2023-05-26 10:15:30 +01:00
ef100_netdev.h	sfc: hook up ef100 representor TX	2022-07-22 12:50:06 +01:00
ef100_nic.c	sfc: use IS_ENABLED() checks for CONFIG_SFC_SRIOV	2023-02-20 10:49:30 +00:00
ef100_nic.h	sfc: add support for devlink port_function_hw_addr_get in ef100	2023-02-16 12:03:13 +01:00
ef100_regs.h	sfc: update EF100 register descriptions	2022-07-22 12:50:06 +01:00
ef100_rep.c	sfc: add support for devlink port_function_hw_addr_get in ef100	2023-02-16 12:03:13 +01:00
ef100_rep.h	sfc: add support for devlink port_function_hw_addr_get in ef100	2023-02-16 12:03:13 +01:00
ef100_rx.c	sfc: add ability for extra channels to receive raw RX buffers	2022-11-16 09:07:02 +00:00
ef100_rx.h
ef100_sriov.c	sfc: add skeleton ef100 VF representors	2022-07-22 12:50:06 +01:00
ef100_sriov.h	sfc: add skeleton ef100 VF representors	2022-07-22 12:50:06 +01:00
ef100_tx.c	sfc (gcc13): synchronize ef100_enqueue_skb()'s return type	2022-11-02 20:38:17 -07:00
ef100_tx.h	sfc: support passing a representor to the EF100 TX path	2022-07-22 12:50:06 +01:00
ef100.c	sfc_ef100: Drop redundant pci_disable_pcie_error_reporting()	2023-03-08 23:34:39 -08:00
ef100.h
efx_channels.c	sfc: add start and stop methods to channels	2022-11-16 09:07:02 +00:00
efx_channels.h
efx_common.c	sfc: Fix use-after-free due to selftest_work	2023-04-17 08:22:26 +01:00
efx_common.h	sfc: attach/detach EF100 representors along with their owning PF	2022-07-22 12:50:06 +01:00
efx_devlink.c	devlink: move port_fn_hw_addr_get/set() to devlink_port_ops	2023-05-30 10:32:20 -07:00
efx_devlink.h	sfc: add devlink port support for ef100	2023-02-16 12:03:12 +01:00
efx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-04-20 16:29:51 -07:00
efx.h	sfc: attach/detach EF100 representors along with their owning PF	2022-07-22 12:50:06 +01:00
enum.h
ethtool_common.c	sfc: remove 'log-tc-errors' ethtool private flag	2022-10-19 13:00:05 -07:00
ethtool_common.h	sfc: remove 'log-tc-errors' ethtool private flag	2022-10-19 13:00:05 -07:00
ethtool.c
farch_regs.h
filter.h	sfc: include vport_id in filter spec hash and equal()	2022-10-19 17:08:43 -07:00
io.h
Kconfig	sfc: add devlink support for ef100	2023-02-16 12:03:12 +01:00
mae_counter_format.h	sfc: add extra RX channel to receive MAE counter updates on ef100	2022-11-16 09:07:02 +00:00
mae.c	sfc: support TC decap rules matching on enc_src_port	2023-05-12 10:37:02 +01:00
mae.h	sfc: support TC decap rules matching on enc_src_port	2023-05-12 10:37:02 +01:00
Makefile	sfc: add devlink support for ef100	2023-02-16 12:03:12 +01:00
mcdi_filters.c	sfc: use a dynamic m-port for representor RX and set it promisc	2022-07-29 21:22:07 -07:00
mcdi_filters.h	sfc: move table locking into filter_table_{probe,remove} methods	2022-07-29 21:22:06 -07:00
mcdi_functions.c
mcdi_functions.h
mcdi_mon.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
mcdi_pcol_mae.h	sfc: insert default MAE rules to connect VFs to representors	2022-07-29 21:22:06 -07:00
mcdi_pcol.h	sfc: update MCDI protocol headers	2022-07-19 13:37:04 -07:00
mcdi_port_common.c	sfc: Fix module EEPROM reporting for QSFP modules	2023-05-01 07:34:04 +01:00
mcdi_port_common.h
mcdi_port.c
mcdi_port.h
mcdi.c	sfc: add devlink info support for ef100	2023-02-16 12:03:12 +01:00
mcdi.h	sfc: support offloading TC VLAN push/pop actions to the MAE	2023-03-10 21:28:59 -08:00
mtd.c
net_driver.h	sfc: add devlink port support for ef100	2023-02-16 12:03:12 +01:00
nic_common.h
nic.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
nic.h
ptp.c	sfc: remove expired unicast PTP filters	2023-04-03 19:02:51 -07:00
ptp.h
rx_common.c	sfc: add ability for an RXQ to grant credits on refill	2022-11-16 09:07:02 +00:00
rx_common.h
rx.c
selftest.c
selftest.h
sriov.c
sriov.h
tc_bindings.c	sfc: bind indirect blocks for TC offload on EF100	2022-09-28 09:43:22 +01:00
tc_bindings.h	sfc: bind indirect blocks for TC offload on EF100	2022-09-28 09:43:22 +01:00
tc_counters.c	sfc: ensure type is valid before updating seen_gen	2022-11-23 13:47:51 +00:00
tc_counters.h	sfc: implement counters readout to TC stats	2022-11-16 09:07:03 +00:00
tc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-01 15:38:26 -07:00
tc.h	sfc: support TC decap rules matching on enc_src_port	2023-05-12 10:37:02 +01:00
tx_common.c	sfc: support passing a representor to the EF100 TX path	2022-07-22 12:50:06 +01:00
tx_common.h	sfc: support passing a representor to the EF100 TX path	2022-07-22 12:50:06 +01:00
tx_tso.c	net: vlan: introduce skb_vlan_eth_hdr()	2023-04-23 14:16:44 +01:00
tx.c	sfc: Use kmap_local_page() instead of kmap_atomic()	2022-11-25 10:44:01 +00:00
tx.h
vfdi.h
workarounds.h