linux-stable/drivers/net/ethernet/microchip/lan966x
Jakub Kicinski b568d3072a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  418e53401e ("ice: move devlink port creation/deletion")
  643ef23bd9 ("ice: Introduce local var for readability")
https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/
https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/

drivers/net/ethernet/engleder/tsnep_main.c
  3d53aaef43 ("tsnep: Fix TX queue stop/wake for multiple queues")
  25faa6a4c5 ("tsnep: Replace TX spin_lock with __netif_tx_lock")
https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/

net/netfilter/nf_conntrack_proto_sctp.c
  13bd9b31a9 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b765148 ("netfilter: conntrack: unify established states for SCTP paths")
  f71cb8f45d ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")
https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/
https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-01-27 22:56:18 -08:00
..
Kconfig net: lan966x: Add initial VCAP 2022-11-29 13:08:23 +01:00
lan966x_cbs.c net: lan966x: Add offload support for cbs 2022-09-28 09:36:28 +01:00
lan966x_ethtool.c net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init() 2022-11-16 09:10:29 +00:00
lan966x_ets.c net: lan966x: Add offload support for ets 2022-09-28 09:36:28 +01:00
lan966x_fdb.c net: lan966x: Extend FDB to support also lag 2022-08-22 14:00:54 +01:00
lan966x_fdma.c lan966x: execute xdp_do_flush() before napi_complete_done() 2023-01-27 22:27:59 -08:00
lan966x_goto.c net: microchip: vcap api: Use src and dst chain id to chain VCAP lookups 2023-01-16 13:45:17 +00:00
lan966x_ifh.h net: lan966x: Add define IFH_LEN_BYTES 2022-11-11 10:49:34 +00:00
lan966x_lag.c net: lan966x: Extend MAC to support also lag interfaces. 2022-08-22 14:00:54 +01:00
lan966x_mac.c net: lan966x: Extend MAC to support also lag interfaces. 2022-08-22 14:00:54 +01:00
lan966x_main.c net: lan966x: add missing fwnode_handle_put() for ports node 2023-01-13 21:53:28 -08:00
lan966x_main.h net: microchip: vcap api: Use src and dst chain id to chain VCAP lookups 2023-01-16 13:45:17 +00:00
lan966x_mdb.c net: lan966x: Update mdb when enabling/disabling mcast_snooping 2022-02-05 15:00:43 +00:00
lan966x_mirror.c net: lan966x: Add port mirroring support using tc-matchall 2022-10-03 12:46:46 +01:00
lan966x_mqprio.c net: lan966x: Fix spelling mistake "tarffic" -> "traffic" 2022-09-30 12:34:01 +01:00
lan966x_phylink.c net: remove explicit phylink_generic_validate() references 2022-11-07 17:54:57 -08:00
lan966x_police.c net: lan966x: Add port police support using tc-matchall 2022-10-03 12:46:46 +01:00
lan966x_port.c net: lan966x: Fix configuration of the PCS 2022-12-22 12:21:05 +01:00
lan966x_ptp.c net: lan966x: check for ptp to be enabled in lan966x_ptp_deinit() 2023-01-11 08:31:36 +00:00
lan966x_regs.h net: lan966x: add vcap registers 2022-11-29 13:08:23 +01:00
lan966x_switchdev.c net: lan966x: Extend FDB to support also lag 2022-08-22 14:00:54 +01:00
lan966x_taprio.c net: lan966x: Add offload support for taprio 2022-09-23 12:31:27 +01:00
lan966x_tbf.c net: lan966x: Add offload support for tbf 2022-09-28 09:36:28 +01:00
lan966x_tc.c net: lan966x: add tc flower support for VCAP API 2022-11-29 13:08:23 +01:00
lan966x_tc_flower.c net: microchip: vcap api: Check chains when adding a tc flower filter 2023-01-16 13:45:17 +00:00
lan966x_tc_matchall.c net: microchip: vcap api: Use src and dst chain id to chain VCAP lookups 2023-01-16 13:45:17 +00:00
lan966x_vcap_ag_api.c net: lan966x: Add is2 vcap model to vcap API. 2022-11-29 13:08:23 +01:00
lan966x_vcap_ag_api.h net: lan966x: Add is2 vcap model to vcap API. 2022-11-29 13:08:23 +01:00
lan966x_vcap_impl.c net: microchip: vcap api: Always enable VCAP lookups 2023-01-16 13:45:16 +00:00
lan966x_vlan.c net: lan966x: Adjust maximum frame size when vlan is enabled/disabled 2022-11-01 21:18:16 -07:00
lan966x_xdp.c net: lan966x: Add support for XDP_REDIRECT 2022-11-25 10:38:10 +00:00
Makefile net: lan966x: add tc matchall goto action 2022-11-29 13:08:23 +01:00