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

..

apparmor

exec: Check __FMODE_EXEC instead of in_execve for LSMs

2024-01-24 11:38:58 -08:00

bpf

lsm: mark the lsm_id variables are marked as static

2023-11-12 22:54:42 -05:00

integrity

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

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

keys

Revert "KEYS: encrypted: Add check for strsep"

2024-01-24 16:11:59 -05:00

landlock

Merge tag 'landlock-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux

2024-01-09 13:22:15 -08:00

loadpin

lsm: mark the lsm_id variables are marked as static

2023-11-12 22:54:42 -05:00

lockdown

LSM: Identify modules by more than name

2023-11-12 22:54:42 -05:00

safesetid

lsm: mark the lsm_id variables are marked as static

2023-11-12 22:54:42 -05:00

selinux

bpf,selinux: Allocate bpf_security_struct per BPF token

2024-01-24 16:21:02 -08:00

smack

Merge tag 'for-6.8/io_uring-2024-01-08' of git://git.kernel.dk/linux

2024-01-11 14:19:23 -08:00

tomoyo

exec: Check __FMODE_EXEC instead of in_execve for LSMs

2024-01-24 11:38:58 -08:00

yama

lsm: mark the lsm_id variables are marked as static

2023-11-12 22:54:42 -05:00

commoncap.c

lsm: mark the lsm_id variables are marked as static

2023-11-12 22:54:42 -05:00

device_cgroup.c

device_cgroup: Fix kernel-doc warnings in device_cgroup

2023-06-21 09:30:49 -04:00

inode.c

security: convert to new timestamp accessors

2023-10-18 14:08:31 +02:00

Kconfig

mm/slab: remove HAVE_HARDENED_USERCOPY_ALLOCATOR

2023-05-24 15:38:17 +02:00

Kconfig.hardening

hardening: Move BUG_ON_DATA_CORRUPTION to hardening options

2023-08-15 14:57:25 -07:00

lsm_audit.c

lsm: fix a number of misspellings

2023-05-25 17:52:15 -04:00

lsm_syscalls.c

LSM: Helpers for attribute names and filling lsm_ctx

2023-11-12 22:54:42 -05:00

Makefile

LSM: syscalls for current process attributes

2023-11-12 22:54:42 -05:00

min_addr.c

sysctl: pass kernel pointers to ->proc_handler

2020-04-27 02:07:40 -04:00

security.c

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

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