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

..

9p

fs/9p: fix uninitialized values during inode evict

2024-03-25 14:16:06 +00:00

adfs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

affs

…

afs

afs: Fix occasional rmdir-then-VNOVNODE with generic/011

2024-03-14 12:13:21 +01:00

autofs

…

bcachefs

bcachefs: reconstruct_inode()

2024-04-03 14:46:51 -04:00

befs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

bfs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

btrfs

btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits()

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

cachefiles

…

ceph

Merge tag 'ceph-for-6.9-rc1' of https://github.com/ceph/ceph-client

2024-03-22 11:15:45 -07:00

coda

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

configfs

…

cramfs

…

crypto

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux

2024-03-12 13:17:36 -07:00

debugfs

…

devpts

…

dlm

Merge tag 'dlm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

2024-03-18 15:39:48 -07:00

ecryptfs

…

efivarfs

…

efs

…

erofs

erofs: drop experimental warning for FSDAX

2024-03-25 10:48:15 +08:00

exfat

Merge tag 'exfat-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat

2024-03-21 09:47:12 -07:00

exportfs

…

ext2

Merge tag 'fs_for_v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2024-03-13 14:30:58 -07:00

ext4

Merge tag 'ext4_for_linus-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2024-03-15 09:20:30 -07:00

f2fs

Merge tag 'f2fs-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

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

fat

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

freevxfs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

fuse

Merge tag 'fuse-update-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

2024-03-15 09:47:14 -07:00

gfs2

Merge tag 'gfs2-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

2024-03-25 10:53:39 -07:00

hfs

…

hfsplus

…

hostfs

…

hpfs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

hugetlbfs

…

iomap

…

isofs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

jbd2

…

jffs2

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

jfs

Merge tag 'fs_for_v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2024-03-13 14:30:58 -07:00

kernfs

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

2024-03-21 13:34:15 -07:00

lockd

Merge tag 'nfsd-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

2024-03-12 14:27:37 -07:00

minix

…

netfs

fscache: Fix error handling in fscache_begin_operation()

2024-03-18 10:33:48 +01:00

nfs

Merge tag 'nfs-for-6.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2024-03-16 11:44:00 -07:00

nfs_common

…

nfsd

Merge tag 'nfsd-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

2024-03-28 14:35:32 -07:00

nilfs2

nilfs2: prevent kernel bug at submit_bh_wbc()

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

nls

…

notify

…

ntfs3

fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64()

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

ocfs2

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

omfs

…

openpromfs

…

orangefs

…

overlayfs

ovl: relax WARN_ON in ovl_verify_area()

2024-03-17 15:59:41 +02:00

proc

kbuild: make -Woverride-init warnings more consistent

2024-03-31 11:32:26 +09:00

pstore

…

qnx4

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

qnx6

…

quota

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

ramfs

…

reiserfs

Merge tag 'fs_for_v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2024-03-13 14:30:58 -07:00

romfs

…

smb

cifs: Fix duplicate fscache cookie warnings

2024-03-27 12:04:06 -05:00

squashfs

…

sysfs

…

sysv

…

tracefs

eventfs: Create eventfs_root_inode to store dentry

2024-03-17 07:58:52 -04:00

ubifs

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

2024-03-21 15:09:29 -07:00

udf

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

ufs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

unicode

…

vboxsf

vboxsf: explicitly deny setlease attempts

2024-04-03 16:06:39 +02:00

verity

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

2024-03-12 17:44:08 -07:00

xfs

xfs: don't use current->journal_info

2024-03-25 10:21:01 +05:30

zonefs

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

2024-03-12 20:32:19 -07:00

aio.c

…

anon_inodes.c

…

attr.c

Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

2024-03-12 20:03:34 -07:00

backing-file.c

…

bad_inode.c

…

binfmt_elf_fdpic.c

binfmt: replace deprecated strncpy

2024-03-21 20:20:52 -07:00

binfmt_elf_test.c

…

binfmt_elf.c

…

binfmt_flat.c

…

binfmt_misc.c

…

binfmt_script.c

…

buffer.c

…

char_dev.c

…

compat_binfmt_elf.c

…

coredump.c

…

d_path.c

…

dax.c

…

dcache.c

…

direct-io.c

…

drop_caches.c

…

eventfd.c

…

eventpoll.c

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

2024-03-12 17:44:08 -07:00

exec.c

Merge tag 'execve-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2024-03-27 09:57:30 -07:00

fcntl.c

…

fhandle.c

…

file_table.c

Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

2024-03-12 20:03:34 -07:00

file.c

…

filesystems.c

…

fs_context.c

…

fs_parser.c

…

fs_pin.c

…

fs_struct.c

…

fs_types.c

…

fs-writeback.c

…

fsopen.c

…

init.c

…

inode.c

Merge tag 'bcachefs-2024-03-13' of https://evilpiepirate.org/git/bcachefs

2024-03-15 09:00:09 -07:00

internal.h

pidfs: remove config option

2024-03-13 12:53:53 -07:00

ioctl.c

…

Kconfig

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

Kconfig.binfmt

…

kernel_read_file.c

…

libfs.c

pidfs: remove config option

2024-03-13 12:53:53 -07:00

locks.c

…

Makefile

…

mbcache.c

…

mnt_idmapping.c

…

mount.h

…

mpage.c

…

namei.c

security: Place security_path_post_mknod() where the original IMA call was

2024-04-03 10:21:32 -07:00

namespace.c

…

nsfs.c

pidfs: remove config option

2024-03-13 12:53:53 -07:00

open.c

Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

2024-03-12 20:03:34 -07:00

pidfs.c

pidfs: remove config option

2024-03-13 12:53:53 -07:00

pipe.c

…

pnode.c

…

pnode.h

…

posix_acl.c

Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

2024-03-12 20:03:34 -07:00

proc_namespace.c

…

read_write.c

…

readdir.c

…

remap_range.c

…

select.c

…

seq_file.c

…

signalfd.c

…

splice.c

…

stack.c

…

stat.c

…

statfs.c

…

super.c

fs,block: get holder during claim

2024-03-18 10:32:44 +01:00

sync.c

…

sysctls.c

…

timerfd.c

…

userfaultfd.c

…

utimes.c

…

xattr.c

…