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

..

accounting

…

arch

Merge tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

2024-03-22 10:22:45 -07:00

bootconfig

…

bpf

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

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

build

perf: build: introduce the libcapstone

2024-02-20 18:06:25 -08:00

certs

…

cgroup

…

counter

…

crypto

crypto: ccp - Update return values for some unit tests

2024-02-24 08:41:20 +08:00

debugging

…

firewire

…

firmware

…

gpio

…

hv

…

iio

…

include

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

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

kvm/kvm_stat

…

laptop

…

leds

…

lib

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

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

memory-model

…

mm

tools/mm: add thpmaps script to dump THP usage info

2024-02-22 10:24:38 -08:00

net/ynl

tools: ynl: copy netlink error to NlError

2024-04-04 10:33:52 -07:00

objtool

objtool: Fix compile failure when using the x32 compiler

2024-03-30 22:12:37 +01:00

pci

…

pcmcia

…

perf

bitops: make BYTES_TO_BITS() treewide-available

2024-04-01 10:49:27 +01:00

power

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

2024-03-07 21:02:51 +01:00

rcu

…

scripts

treewide: remove meaningless assignments in Makefiles

2024-02-23 14:19:07 -08:00

spi

…

testing

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

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

thermal

…

time

…

tracing

tools/rtla: Add -U/--user-load option to timerlat

2024-03-20 05:39:06 +01:00

usb

…

verification

tools/verification: Use tools/build makefiles on rv

2024-03-20 05:39:06 +01:00

virtio

tools: virtio: introduce vhost_net_test

2024-03-05 11:38:14 +01:00

wmi

…

workqueue

workqueue: Implement BH workqueues to eventually replace tasklets

2024-02-04 11:28:06 -10:00

Makefile

tools/Makefile: remove cgroup target

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