Jakub Kicinski cf1ca1f66d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/ip_gre.c
  17af420545 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a77d ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/

Adjacent changes:

net/ipv6/ip6_fib.c
  d21d40605b ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320c1 ("ipv6: remove RTNL protection from inet6_dump_fib()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-04-04 18:01:07 -07:00

..

boot

x86/efistub: Add missing boot_params for mixed mode compat entry

2024-03-26 08:45:27 +01:00

coco

x86/sev: Fix position dependent variable references in startup code

2024-02-06 16:38:42 +01:00

configs

x86/config: Fix warning for 'make ARCH=x86_64 tinyconfig'

2024-03-21 10:09:41 +01:00

crypto

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

2024-01-10 12:23:43 -08:00

entry

x86/vdso: Fix rethunk patching for vdso-image-x32.o too

2024-03-26 10:47:14 +01:00

events

perf/x86/amd/core: Define a proper ref-cycles event for Zen 4 and later

2024-03-26 09:04:21 +01:00

hyperv

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

2024-03-21 10:01:02 -07:00

ia32

…

include

Merge tag 'net-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-04 14:49:10 -07:00

kernel

Merge tag 'net-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-04 14:49:10 -07:00

kvm

Merge tag 'kvmarm-fixes-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

2024-04-02 12:26:15 -04:00

lib

x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO

2024-04-03 10:12:38 -07:00

math-emu

…

mm

x86/sev: Skip ROM range scans and validation for SEV-SNP guests

2024-03-26 15:22:35 +01:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-04 18:01:07 -07:00

pci

PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge

2024-02-29 13:25:24 -06:00

platform

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

2024-03-19 08:48:09 -07:00

power

Merge tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 18:03:09 -07:00

purgatory

x86/bugs: Rename CONFIG_RETPOLINE => CONFIG_MITIGATION_RETPOLINE

2024-01-10 10:52:28 +01:00

ras

…

realmode

x86/trampoline: Bypass compat mode in trampoline_start64() if not needed

2024-02-23 08:40:29 -08:00

tools

x86, relocs: Ignore relocations in .notes section

2024-02-29 22:34:42 -08:00

um

Merge tag 'uml-for-linus-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux

2024-01-17 10:44:34 -08:00

video

fbdev: Replace fb_pgprotect() with pgprot_framebuffer()

2023-10-12 09:20:46 +02:00

virt

x86/build: Use obj-y to descend into arch/x86/virt/

2024-03-30 10:41:49 +01:00

xen

Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-03-21 14:41:00 -07:00

.gitignore

…

Kbuild

x86/build: Use obj-y to descend into arch/x86/virt/

2024-03-30 10:41:49 +01:00

Kconfig

x86/percpu: Disable named address spaces for KCSAN

2024-03-25 12:17:01 +01:00

Kconfig.assembler

…

Kconfig.cpu

x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6

2024-02-09 16:28:19 +01:00

Kconfig.debug

…

Makefile

x86/build: Use obj-y to descend into arch/x86/virt/

2024-03-30 10:41:49 +01:00

Makefile_32.cpu

…

Makefile.postlink

kbuild: remove ARCH_POSTLINK from module builds

2023-10-28 21:10:08 +09:00

Makefile.um

…