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

..

bpf

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

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

cgroup

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

2024-01-18 09:48:40 -08:00

configs

configs/debug: add NET debug config

2024-02-15 17:46:53 -08:00

debug

kdb: Fix a potential buffer overflow in kdb_local()

2024-01-17 17:19:06 +00:00

dma

Merge tag 'dma-mapping-6.8-2024-01-18' of git://git.infradead.org/users/hch/dma-mapping

2024-01-18 16:49:34 -08:00

entry

entry: Move syscall_enter_from_user_mode() to header file

2023-12-21 23:12:18 +01:00

events

uprobes: use pagesize-aligned virtual address when replacing pages

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

futex

futex: Prevent the reuse of stale pi_state

2024-01-19 12:58:17 +01:00

gcov

…

irq

genirq: Initialize resend_node hlist for all interrupt descriptors

2024-01-24 14:15:41 +01:00

kcsan

…

livepatch

…

locking

Merge tag 'rcu.release.v6.8' of https://github.com/neeraju/linux

2024-01-12 16:35:58 -08:00

module

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

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

power

PM: hibernate: Repair excess function parameter description warning

2023-12-20 19:19:26 +01:00

printk

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

2023-11-03 15:44:25 -10:00

rcu

rcu: Defer RCU kthreads wakeup when CPU is dying

2024-01-24 22:46:17 +05:30

sched

sched/membarrier: reduce the ability to hammer on sys_membarrier

2024-02-20 09:38:05 -08:00

time

hrtimer: Report offline hrtimer enqueue

2024-02-06 10:56:35 +01:00

trace

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

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

.gitignore

…

acct.c

…

async.c

Merge tag 'header_cleanup-2024-01-10' of https://evilpiepirate.org/git/bcachefs

2024-01-10 16:43:55 -08:00

audit_fsnotify.c

…

audit_tree.c

Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-11-02 20:53:31 -10:00

audit_watch.c

audit: don't WARN_ON_ONCE(!current->mm) in audit_exe_compare()

2023-11-14 17:34:27 -05:00

audit.c

audit: Send netlink ACK before setting connection in auditd_set

2023-11-12 22:33:49 -05:00

audit.h

…

auditfilter.c

…

auditsc.c

…

backtracetest.c

…

bounds.c

…

capability.c

…

cfi.c

…

compat.c

…

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

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

2024-01-09 10:36:07 -08:00

crash_core.c

kernel/crash_core.c: make __crash_hotplug_lock static

2024-01-12 15:20:47 -08:00

crash_dump.c

…

cred.c

cred: get rid of CONFIG_DEBUG_CREDENTIALS

2023-12-15 14:19:48 -08:00

delayacct.c

…

dma.c

…

exec_domain.c

…

exit.c

exit: wait_task_zombie: kill the no longer necessary spin_lock_irq(siglock)

2024-02-07 21:20:33 -08:00

exit.h

…

extable.c

…

fail_function.c

…

fork.c

exec: Distinguish in_execve from in_exec

2024-01-24 11:48:52 -08:00

freezer.c

Merge tag 'v6.7-rc6' into sched/core, to pick up fixes

2023-12-23 15:52:13 +01:00

gen_kheaders.sh

…

groups.c

…

hung_task.c

…

iomem.c

…

irq_work.c

…

jump_label.c

…

kallsyms_internal.h

…

kallsyms_selftest.c

…

kallsyms_selftest.h

…

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.kexec

kexec: select CRYPTO from KEXEC_FILE instead of depending on it

2023-12-20 13:46:19 -08:00

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

…

kexec_core.c

kexec: do syscore_shutdown() in kernel_kexec

2024-01-12 15:20:47 -08:00

kexec_elf.c

…

kexec_file.c

kexec_file: fix incorrect temp_start value in locate_mem_hole_top_down()

2023-12-29 12:22:25 -08:00

kexec_internal.h

…

kexec.c

…

kheaders.c

…

kprobes.c

kprobes: Remove unnecessary initial values of variables

2024-02-08 23:29:29 +09:00

ksyms_common.c

…

ksysfs.c

…

kthread.c

Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-11-02 20:53:31 -10:00

latencytop.c

…

Makefile

kernel/numa.c: Move logging out of numa.h

2023-12-20 19:26:30 -05:00

module_signature.c

…

notifier.c

…

nsproxy.c

…

numa.c

kernel/numa.c: Move logging out of numa.h

2023-12-20 19:26:30 -05:00

padata.c

…

panic.c

…

params.c

params: Fix multi-line comment style

2023-12-01 09:51:44 -08:00

pid_namespace.c

wait: Remove uapi header file from main header file

2023-12-20 19:26:31 -05:00

pid_sysctl.h

…

pid.c

file: remove __receive_fd()

2023-12-12 14:24:14 +01:00

profile.c

…

ptrace.c

Merge tag 'mm-nonmm-stable-2024-01-09-10-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-01-09 11:46:20 -08:00

range.c

…

reboot.c

Merge tag 'thermal-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2024-01-09 16:20:17 -08:00

regset.c

…

relay.c

kernel: relay: remove relay_file_splice_read dead code, doesn't work

2023-12-29 12:22:27 -08:00

resource_kunit.c

…

resource.c

Merge tag 'mm-nonmm-stable-2024-01-09-10-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-01-09 11:46:20 -08:00

rseq.c

…

scftorture.c

…

scs.c

…

seccomp.c

file: remove __receive_fd()

2023-12-12 14:24:14 +01:00

signal.c

kernel/signal.c: simplify force_sig_info_to_task(), kill recalc_sigpending_and_wake()

2023-12-10 17:21:32 -08:00

smp.c

…

smpboot.c

…

smpboot.h

…

softirq.c

…

stackleak.c

…

stacktrace.c

stacktrace: fix kernel-doc typo

2023-12-29 12:22:29 -08:00

static_call_inline.c

…

static_call.c

…

stop_machine.c

…

sys_ni.c

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

2024-01-09 12:57:46 -08:00

sys.c

getrusage: use sig->stats_lock rather than lock_task_sighand()

2024-02-07 21:20:32 -08:00

sysctl-test.c

…

sysctl.c

…

task_work.c

…

taskstats.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

…

uid16.c

…

uid16.h

…

umh.c

…

up.c

…

user_namespace.c

mnt_idmapping: decouple from namespaces

2023-11-28 14:08:47 +01:00

user-return-notifier.c

…

user.c

…

usermode_driver.c

…

utsname_sysctl.c

…

utsname.c

…

vhost_task.c

…

watch_queue.c

watch_queue: fix kcalloc() arguments order

2023-12-21 13:17:54 +01:00

watchdog_buddy.c

…

watchdog_perf.c

…

watchdog.c

watchdog: if panicking and we dumped everything, don't re-enable dumping

2023-12-29 12:22:30 -08:00

workqueue_internal.h

…

workqueue.c

Revert "workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()"

2024-02-05 15:49:06 -10:00