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

x86/sev: Do not try to parse for the CC blob on non-AMD hardware

2023-08-07 18:05:13 +02:00

coco

Merge tag 'x86_sev_for_v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-06-27 13:26:30 -07:00

configs

arch/*/configs/*defconfig: Replace AUTOFS4_FS by AUTOFS_FS

2023-07-29 14:08:22 -07:00

crypto

Merge tag 'v6.4-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2023-05-29 07:05:49 -04:00

entry

x86/mm: Fix VDSO and VVAR placement on 5-level paging machines

2023-08-09 13:38:48 -07:00

events

perf/x86: Fix lockdep warning in for_each_sibling_event() on SPR

2023-07-10 09:52:20 +02:00

hyperv

Merge tag 'hyperv-fixes-signed-20230804' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

2023-08-04 17:16:14 -07:00

ia32

x86/signal/32: Merge native and compat 32-bit signal code

2022-10-19 09:58:49 +02:00

include

locking: remove spin_lock_prefetch

2023-08-12 09:18:47 -07:00

kernel

Merge tag 'x86_urgent_for_v6.5_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-08-12 08:47:01 -07:00

kvm

x86: Move gds_ucode_mitigated() declaration to header

2023-08-10 09:13:21 -07:00

lib

x86/srso: Add a forgotten NOENDBR annotation

2023-07-29 16:27:17 +02:00

math-emu

x86/fpu: Include asm/fpu/regset.h

2023-05-18 11:56:18 -07:00

mm

Merge branch 'expand-stack'

2023-06-28 20:35:21 -07:00

net

bpf: Support new 32bit offset jmp instruction

2023-07-27 18:52:33 -07:00

pci

Merge tag 'x86_cleanups_for_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-06-26 16:43:54 -07:00

platform

Merge tag 'x86-urgent-2023-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-07-01 11:40:01 -07:00

power

x86/topology: Remove CPU0 hotplug option

2023-05-15 13:44:49 +02:00

purgatory

Merge tag 'hardening-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2023-06-27 21:24:18 -07:00

ras

…

realmode

x86/realmode: Make stack lock work in trampoline_compat()

2023-05-30 14:11:47 +02:00

tools

ELF: fix all "Elf" typos

2023-04-08 13:45:37 -07:00

um

um: make stub data pages size tweakable

2023-04-20 23:08:43 +02:00

video

Merge tag 'drm-next-2023-06-29' of git://anongit.freedesktop.org/drm/drm

2023-06-29 11:00:17 -07:00

virt/vmx/tdx

…

xen

Merge tag 'for-linus-6.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2023-07-13 13:39:36 -07:00

.gitignore

…

Kbuild

…

Kconfig

Merge tag 'gds-for-linus-2023-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-08-07 17:03:54 -07:00

Kconfig.assembler

crypto: x86/aria-avx - fix build failure with old binutils

2023-01-20 18:29:31 +08:00

Kconfig.cpu

x86/cpu: Remove X86_FEATURE_NAMES

2023-05-15 20:03:08 +02:00

Kconfig.debug

docs: move x86 documentation into Documentation/arch/

2023-03-30 12:58:51 -06:00

Makefile

x86/unwind/orc: Add ELF section with ORC version identifier

2023-06-16 17:17:42 +02:00

Makefile_32.cpu

…

Makefile.postlink

x86/build: Avoid relocation information in final vmlinux

2023-06-14 19:54:40 +02:00

Makefile.um

um: Only disable SSE on clang to work around old GCC bugs

2023-04-04 09:57:05 +02:00