linux-stable/include/linux/soc
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
..
actions
amlogic
apple soc: apple: rtkit: Add apple_rtkit_poll 2022-09-17 19:53:29 +02:00
brcmstb
cirrus
dove
ixp4xx
marvell/octeontx2
mediatek wireless-next patches for v6.3 2023-01-23 21:27:31 -08:00
mmp
nxp
pxa
qcom regulator: Updates for v6.2 2022-12-13 12:49:59 -08:00
renesas
samsung
sunxi soc: sunxi: sram: Return void from the release function 2022-09-18 22:54:02 +02:00
ti ARM: omap1: fix !ARCH_OMAP1_ANY link failures 2023-01-10 23:05:26 +01:00