Jakub Kicinski 7ff57803d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/sfc/tc.c fa165e1949 ("sfc: don't unregister flow_indr if it was never registered") 3bf969e88a ("sfc: add MAE table machinery for conntrack table") https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-18 12:44:56 -07:00
..
boot	powerpc: dts: turris1x.dts: Fix PCIe MEM size for pci2 node	2023-07-03 16:26:51 +10:00
configs	arch/*/configs/*defconfig: Replace AUTOFS4_FS by AUTOFS_FS	2023-07-29 14:08:22 -07:00
crypto	powerpc/crypto: Add gitignore for generated P10 AES/GCM .S files	2023-07-17 13:52:46 +10:00
include	locking: remove spin_lock_prefetch	2023-08-12 09:18:47 -07:00
kernel	powerpc/64e: Fix secondary thread bringup for ELFv2 kernels	2023-08-01 21:01:27 +10:00
kexec	powerpc/kexec_file: print error string on usable memory property update failure	2023-02-15 23:14:06 +11:00
kvm	powerpc updates for 6.5	2023-06-30 09:20:08 -07:00
lib	powerpc: remove checks for binutils older than 2.25	2023-06-27 16:59:29 +10:00
math-emu	powerpc/math-emu: Inhibit W=1 warnings	2022-09-08 11:11:18 +10:00
mm	powerpc/mm/altmap: Fix altmap boundary check	2023-07-28 16:47:19 +10:00
net	powerpc/bpf: populate extable entries only during the last pass	2023-05-15 15:40:31 +10:00
perf	powerpc/perf: Properly detect mpc7450 family	2023-03-30 23:35:43 +11:00
platforms	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-10 14:10:53 -07:00
purgatory	powerpc/purgatory: remove PGO flags	2023-06-12 11:31:50 -07:00
sysdev	net: fs_enet: Remove stale prototypes from fsl_soc.c	2023-08-08 15:01:30 -07:00
tools	powerpc/64: Use -mprofile-kernel for big endian ELFv2 kernels	2023-06-14 12:46:42 +10:00
xmon	- Yosry Ahmed brought back some cgroup v1 stats in OOM logs.	2023-06-28 10:28:11 -07:00
Kbuild	kbuild: use more subdir- for visiting subdirectories while cleaning	2021-10-24 13:49:46 +09:00
Kconfig	powerpc updates for 6.5	2023-06-30 09:20:08 -07:00
Kconfig.debug	powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y	2023-07-03 16:07:55 +10:00
Makefile	powerpc: remove checks for binutils older than 2.25	2023-06-27 16:59:29 +10:00
Makefile.postlink	kbuild: remove --include-dir MAKEFLAG from top Makefile	2023-02-05 18:51:22 +09:00