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

..

alpha

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

arc

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

arm

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

2024-03-28 17:25:57 -07:00

arm64

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

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

csky

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

hexagon

hexagon: vmlinux.lds.S: handle attributes section

2024-03-26 11:07:23 -07:00

loongarch

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

2024-03-28 17:25:57 -07:00

m68k

Merge tag 'tty-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2024-03-21 12:44:10 -07:00

microblaze

arch: define CONFIG_PAGE_SIZE_*KB on all architectures

2024-03-06 19:29:09 +01:00

mips

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

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

nios2

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

openrisc

Merge tag 'for-linus' of https://github.com/openrisc/linux

2024-03-14 15:53:10 -07:00

parisc

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

2024-03-28 17:25:57 -07:00

powerpc

Merge tag 'powerpc-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2024-03-23 09:21:26 -07:00

riscv

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2024-04-03 10:26:37 -07:00

s390

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

2024-03-28 17:25:57 -07:00

sh

Merge tag 'sh-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

2024-03-21 10:13:47 -07:00

sparc

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2024-03-27 07:52:34 -07:00

um

Merge tag 'devicetree-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2024-03-15 12:37:59 -07:00

x86

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

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

xtensa

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

.gitignore

…

Kconfig

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

2024-03-23 08:43:21 -07:00