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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/udp.c
  f796feabb9 ("udp: add local "peek offset enabled" flag")
  56667da739 ("net: implement lockless setsockopt(SO_PEEK_OFF)")

Adjacent changes:

net/unix/garbage.c
  aa82ac51d6 ("af_unix: Drop oob_skb ref before purging queue in GC.")
  11498715f2 ("af_unix: Remove io_uring code for GC.")

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

2024-02-22 15:29:26 -08:00

..

alpha

Merge tag 'rtc-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

2024-01-18 17:25:39 -08:00

arc

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

arm

Merge tag 'mm-hotfixes-stable-2024-02-10-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-02-10 15:28:07 -08:00

arm64

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

2024-02-22 15:29:26 -08:00

csky

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

hexagon

Merge tag 'asm-generic-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2024-01-10 18:13:44 -08:00

loongarch

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

m68k

kbuild: use 4-space indentation when followed by conditionals

2024-02-15 06:05:44 +09:00

microblaze

Merge tag 'microblaze-v6.8' of git://git.monstr.eu/linux-2.6-microblaze

2024-01-17 11:27:23 -08:00

mips

MIPS: Clear Cause.BD in instruction_pointer_set

2024-02-12 23:04:40 +01:00

nios2

Merge tag 'percpu-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

2024-01-18 15:01:28 -08:00

openrisc

…

parisc

kbuild: use 4-space indentation when followed by conditionals

2024-02-15 06:05:44 +09:00

powerpc

Merge tag 'powerpc-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2024-02-17 16:59:31 -08:00

riscv

Merge tag 'kvm-riscv-fixes-6.8-1' of https://github.com/kvm-riscv/linux into HEAD

2024-02-14 12:35:40 -05:00

s390

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

sh

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

2024-01-20 09:24:06 -08:00

sparc

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

um

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

x86

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

2024-02-22 15:29:26 -08:00

xtensa

work around gcc bugs with 'asm goto' with outputs

2024-02-09 15:57:48 -08:00

.gitignore

…

Kconfig

scs: add CONFIG_MMU dependency for vfree_atomic()

2024-01-25 23:52:21 -08:00