Jakub Kicinski e63c1822ac Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  e009b2efb7 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
  0f2b214779 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-01-04 18:06:46 -08:00

..

falcon

net: ethtool: pass a pointer to parameters to get/set_rxfh ethtool ops

2023-12-13 22:07:16 -08:00

siena

net: ethtool: get rid of get/set_rxfh_context functions

2023-12-13 22:07:16 -08:00

bitfield.h

sfc: offload left-hand side rules for conntrack

2023-08-09 11:14:38 +01:00

ef10_regs.h

…

ef10_sriov.c

…

ef10_sriov.h

…

ef10.c

sfc: Implement ndo_hwtstamp_(get|set)

2023-12-05 07:45:43 -08:00

ef100_ethtool.c

net: ethtool: get rid of get/set_rxfh_context functions

2023-12-13 22:07:16 -08:00

ef100_ethtool.h

…

ef100_netdev.c

…

ef100_netdev.h

…

ef100_nic.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-08-18 12:44:56 -07:00

ef100_nic.h

…

ef100_regs.h

…

ef100_rep.c

…

ef100_rep.h

…

ef100_rx.c

…

ef100_rx.h

…

ef100_sriov.c

…

ef100_sriov.h

…

ef100_tx.c

…

ef100_tx.h

…

ef100.c

…

ef100.h

…

efx_channels.c

net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush().

2023-10-03 07:34:51 -07:00

efx_channels.h

…

efx_common.c

…

efx_common.h

…

efx_devlink.c

…

efx_devlink.h

…

efx.c

sfc: Implement ndo_hwtstamp_(get|set)

2023-12-05 07:45:43 -08:00

efx.h

…

enum.h

…

ethtool_common.c

net: ethtool: get rid of get/set_rxfh_context functions

2023-12-13 22:07:16 -08:00

ethtool_common.h

net: ethtool: get rid of get/set_rxfh_context functions

2023-12-13 22:07:16 -08:00

ethtool.c

net: ethtool: get rid of get/set_rxfh_context functions

2023-12-13 22:07:16 -08:00

filter.h

…

io.h

Merge tag 'mm-stable-2023-08-28-18-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-08-29 14:25:26 -07:00

Kconfig

…

mae_counter_format.h

…

mae.c

sfc: support offloading ct(nat) action in RHS rules

2023-10-15 14:25:03 +01:00

mae.h

sfc: introduce ethernet pedit set action infrastructure

2023-08-27 06:56:54 +01:00

Makefile

…

mcdi_filters.c

…

mcdi_filters.h

…

mcdi_functions.c

…

mcdi_functions.h

…

mcdi_mon.c

…

mcdi_pcol_mae.h

…

mcdi_pcol.h

…

mcdi_port_common.c

…

mcdi_port_common.h

…

mcdi_port.c

…

mcdi_port.h

…

mcdi.c

sfc: replace deprecated strncpy with strscpy

2023-10-13 17:24:39 -07:00

mcdi.h

sfc: offload left-hand side rules for conntrack

2023-08-09 11:14:38 +01:00

mtd.c

…

net_driver.h

sfc: Implement ndo_hwtstamp_(get|set)

2023-12-05 07:45:43 -08:00

nic_common.h

…

nic.c

…

nic.h

…

ptp.c

sfc: Implement ndo_hwtstamp_(get|set)

2023-12-05 07:45:43 -08:00

ptp.h

sfc: Implement ndo_hwtstamp_(get|set)

2023-12-05 07:45:43 -08:00

rx_common.c

sfc: fix a double-free bug in efx_probe_filters

2024-01-02 16:08:11 -08:00

rx_common.h

…

rx.c

sfc: check for zero length in EF10 RX prefix

2023-09-01 08:14:57 +01:00

selftest.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-08-24 10:51:39 -07:00

selftest.h

…

sriov.c

…

sriov.h

…

tc_bindings.c

…

tc_bindings.h

…

tc_conntrack.c

sfc: parse mangle actions (NAT) in conntrack entries

2023-10-15 14:25:03 +01:00

tc_conntrack.h

sfc: handle non-zero chain_index on TC rules

2023-08-09 11:14:38 +01:00

tc_counters.c

sfc: handle error pointers returned by rhashtable_lookup_get_insert_fast()

2023-09-21 10:37:16 +02:00

tc_counters.h

sfc: offload conntrack flow entries (match only) from CT zones

2023-08-09 11:14:38 +01:00

tc_encap_actions.c

sfc: handle error pointers returned by rhashtable_lookup_get_insert_fast()

2023-09-21 10:37:16 +02:00

tc_encap_actions.h

…

tc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-10-26 13:46:28 -07:00

tc.h

sfc: support offloading ct(nat) action in RHS rules

2023-10-15 14:25:03 +01:00

tx_common.c

…

tx_common.h

…

tx_tso.c

…

tx.c

…

tx.h

…

workarounds.h

…