Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 28 Jan 2023 06:25:19 +0000 (22:25 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 28 Jan 2023 06:56:18 +0000 (22:56 -0800)
commitb568d3072a443fac22d35d6342f48ee27b811661
treeccfc287070b55e4aeffb6a57e9e0434bc5b40c90
parentc2ea552065e43d05bce240f53c3185fd3a066204
parentff445b8397745ea94675162faa0e9b0079ca521d
Merge git://git./linux/kernel/git/netdev/net

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  418e53401e47 ("ice: move devlink port creation/deletion")
  643ef23bd9dd ("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
  3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues")
  25faa6a4c5ca ("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
  13bd9b31a969 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b7651489f ("netfilter: conntrack: unify established states for SCTP paths")
  f71cb8f45d09 ("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>
15 files changed:
MAINTAINERS
arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
drivers/net/ethernet/adi/adin1110.c
drivers/net/ethernet/engleder/tsnep_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/iavf/iavf.h
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/renesas/rswitch.c
drivers/net/mdio/mdio-mux-meson-g12a.c
drivers/net/virtio_net.c
drivers/scsi/iscsi_tcp.c
net/netfilter/nf_conntrack_proto_sctp.c