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	Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"	2023-08-07 09:37:31 +02:00
configs	arch/*/configs/*defconfig: Replace AUTOFS4_FS by AUTOFS_FS	2023-07-29 14:08:22 -07:00
errata	Merge patch series "riscv: some CMO alternative related clean up"	2023-07-06 10:32:38 -07:00
include	riscv: Implement flush_cache_vmap()	2023-08-10 08:54:29 -07:00
kernel	riscv: Fix CPU feature detection with SMP disabled	2023-08-08 15:28:25 -07:00
kvm	ARM64:	2023-07-03 15:32:22 -07:00
lib	riscv: Allow to downgrade paging mode from the command line	2023-04-26 07:30:52 -07:00
mm	riscv: mm: fix 2 instances of -Wmissing-variable-declarations	2023-08-08 15:31:34 -07:00
net	riscv, bpf: Adapt bpf trampoline to optimized riscv ftrace framework	2023-08-02 14:03:56 -07:00
purgatory	hardening updates for v6.5-rc1	2023-06-27 21:24:18 -07:00
tools	riscv: Check relocations at compile time	2023-04-19 07:46:32 -07:00
Kbuild	riscv: move errata/ and kvm/ builds to arch/riscv/Kbuild	2022-06-01 22:26:32 -07:00
Kconfig	RISC-V Patches for the 6.5 Merge Window, Part 2	2023-07-07 10:07:19 -07:00
Kconfig.debug	RISC-V: Remove EARLY_PRINTK support	2018-12-17 10:23:46 -08:00
Kconfig.errata	Merge patch series "RISC-V: Fixes for riscv_has_extension[un]likely()'s alternative dependency"	2023-03-29 12:26:38 -07:00
Kconfig.socs	RISC-V: make ARCH_THEAD preclude XIP_KERNEL	2023-07-05 22:21:23 +02:00
Makefile	riscv: Enable Vector code to be built	2023-06-08 07:16:56 -07:00
Makefile.postlink	riscv: Use --emit-relocs in order to move .rela.dyn in init	2023-04-19 07:46:33 -07:00