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
..
boot	AT91 fixes for 6.2:	2023-01-20 10:40:52 +01:00
common	ARM: 9263/1: use .arch directives instead of assembler command line flags	2022-11-08 18:36:17 +00:00
configs	SoC: arm defconfig updates for 6.2	2022-12-12 10:10:16 -08:00
crypto	crypto: Prepare to move crypto_tfm_ctx	2022-12-02 18:12:40 +08:00
include	net: checksum: drop the linux/uaccess.h include	2023-01-27 11:19:46 +00:00
kernel	ARM updates for 6.2	2022-12-13 15:22:14 -08:00
lib	ARM: 9279/1: support function error injection	2022-12-07 14:08:38 +00:00
mach-actions
mach-airoha
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91	ARM updates for 6.2	2022-12-13 15:22:14 -08:00
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci	ARM: SoC code changes for 6.1	2022-10-06 11:22:25 -07:00
mach-digicolor
mach-dove
mach-ep93xx	TTY/Serial driver update for 6.1-rc1	2022-10-07 16:36:24 -07:00
mach-exynos
mach-footbridge	ARM: footbridge: drop unnecessary inclusion	2023-01-09 23:18:16 +01:00
mach-gemini
mach-highbank
mach-hisi
mach-hpe
mach-imx	ARM: imx: add missing of_node_put()	2022-12-31 21:13:40 +08:00
mach-iop32x
mach-ixp4xx	ARM: ixp4xx: Remove unused debug iomap	2022-11-23 09:29:20 +01:00
mach-keystone	ARM: keystone: Replace platform SMP with PSCI	2022-10-27 20:12:27 -05:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-milbeaut
mach-mmp	ARM: mmp: fix timer_read delay	2022-12-04 13:11:40 +01:00
mach-moxart
mach-mstar
mach-mv78xx0
mach-mvebu	ARM updates for 6.2	2022-12-13 15:22:14 -08:00
mach-mxs	SoC code updates for 6.2	2022-12-12 10:14:52 -08:00
mach-nomadik
mach-npcm	ARM: 9263/1: use .arch directives instead of assembler command line flags	2022-11-08 18:36:17 +00:00
mach-nspire
mach-omap1	ARM: omap1: fix building gpio15xx	2023-01-10 23:05:33 +01:00
mach-omap2	New Feature:	2022-12-17 14:06:53 -06:00
mach-orion5x
mach-oxnas
mach-pxa	ARM: pxa: enable PXA310/PXA320 for DT-only build	2023-01-09 17:00:13 +01:00
mach-qcom
mach-rda
mach-realtek
mach-rockchip
mach-rpc
mach-s3c	ARM: s3c64xx: include header defining input event codes	2022-10-28 11:56:17 -07:00
mach-s5pv210
mach-sa1100
mach-shmobile	ARM: shmobile: Drop selecting GPIOLIB and PINCTRL	2022-10-28 14:31:24 +02:00
mach-socfpga
mach-spear	ARM: spear: Do not use timer namespace for timer_shutdown() function	2022-11-24 15:09:10 +01:00
mach-sti
mach-stm32
mach-sunplus
mach-sunxi
mach-tegra	ARM: 9263/1: use .arch directives instead of assembler command line flags	2022-11-08 18:36:17 +00:00
mach-uniphier
mach-ux500	ARM: ux500: Drop unused register file	2022-11-08 21:18:42 +01:00
mach-versatile	TTY/Serial driver update for 6.1-rc1	2022-10-07 16:36:24 -07:00
mach-vt8500
mach-zynq
mm	ARM updates for 6.2	2022-12-13 15:22:14 -08:00
net
nwfpe	ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod	2022-11-07 14:19:02 +00:00
plat-orion
probes
tools
vdso	ARM: 9253/1: ubsan: select ARCH_HAS_UBSAN_SANITIZE_ALL	2022-11-07 14:19:00 +00:00
vfp	ARM: 9272/1: vfp: Add hwcap for FEAT_AA32I8MM	2022-11-28 11:57:34 +00:00
xen	xen/virtio: Optimize the setup of "xen-grant-dma" devices	2022-12-05 12:59:49 +01:00
Kbuild
Kconfig	ARM: SoC fixes for 6.2	2022-12-19 16:07:59 -06:00
Kconfig-nommu
Kconfig.assembler
Kconfig.debug
Makefile	ARM updates for 6.2	2022-12-13 15:22:14 -08:00