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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/sfc/tc.c
  622ab65634 ("sfc: fix error unwinds in TC offload")
  b6583d5e9e ("sfc: support TC decap rules matching on enc_src_port")

net/mptcp/protocol.c
  5b825727d0 ("mptcp: add annotations around msk->subflow accesses")
  e76c8ef5cc ("mptcp: refactor mptcp_stream_accept()")

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

2023-06-01 15:38:26 -07:00

..

bpf

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2023-05-26 17:26:01 -07:00

cgroup

Merge tag 'cgroup-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2023-04-29 10:05:22 -07:00

configs

Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2023-04-27 12:07:50 -07:00

debug

…

dma

Merge tag 'dma-mapping-6.4-2023-04-28' of git://git.infradead.org/users/hch/dma-mapping

2023-04-29 10:29:57 -07:00

entry

ptrace: Provide set/get interface for syscall user dispatch

2023-04-16 14:23:07 +02:00

events

perf/core: Fix perf_sample_data not properly initialized for different swevents in perf_tp_event()

2023-05-08 10:58:26 +02:00

futex

…

gcov

…

irq

Merge tag 'for-linus-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2023-05-27 09:42:56 -07:00

kcsan

Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-04-27 19:42:02 -07:00

livepatch

Merge tag 'sched-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-04-28 14:53:30 -07:00

locking

Merge tag 'core-debugobjects-2023-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-05-28 07:15:33 -04:00

module

module: fix module load for ia64

2023-05-30 09:29:40 -07:00

power

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

2023-05-03 12:01:05 -07:00

printk

Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-04-27 19:42:02 -07:00

rcu

Merge tag 'rcu.6.4.april5.2023.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jfern/linux

2023-04-24 12:16:14 -07:00

sched

sched: fix cid_lock kernel-doc warnings

2023-05-08 10:58:28 +02:00

time

tick/broadcast: Make broadcast device replacement work correctly

2023-05-08 23:18:16 +02:00

trace

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

2023-06-01 15:38:26 -07:00

.gitignore

…

acct.c

…

async.c

…

audit_fsnotify.c

…

audit_tree.c

…

audit_watch.c

…

audit.c

…

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 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-04-27 19:42:02 -07:00

crash_core.c

mm, treewide: redefine MAX_ORDER sanely

2023-04-05 19:42:46 -07:00

crash_dump.c

…

cred.c

…

delayacct.c

delayacct: track delays from IRQ/SOFTIRQ

2023-04-18 16:39:34 -07:00

dma.c

…

exec_domain.c

…

exit.c

fork, vhost: Use CLONE_THREAD to fix freezer/ps regression

2023-06-01 17:15:33 -04:00

extable.c

…

fail_function.c

…

fork.c

fork, vhost: Use CLONE_THREAD to fix freezer/ps regression

2023-06-01 17:15:33 -04:00

freezer.c

…

gen_kheaders.sh

…

groups.c

…

hung_task.c

kernel/hung_task.c: set some hung_task.c variables storage-class-specifier to static

2023-04-08 13:45:37 -07:00

iomem.c

…

irq_work.c

trace: Add trace_ipi_send_cpu()

2023-03-24 11:01:29 +01:00

jump_label.c

…

kallsyms_internal.h

…

kallsyms_selftest.c

…

kallsyms_selftest.h

…

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

…

kexec_core.c

…

kexec_elf.c

…

kexec_file.c

kexec: remove unnecessary arch_kexec_kernel_image_load()

2023-04-08 13:45:38 -07:00

kexec_internal.h

…

kexec.c

…

kheaders.c

kheaders: Use array declaration instead of char

2023-03-24 20:10:59 -07:00

kprobes.c

…

ksysfs.c

kernel/ksysfs.c: use sysfs_emit for sysfs show handlers

2023-03-24 17:09:14 +01:00

kthread.c

Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-04-27 19:42:02 -07:00

latencytop.c

…

Makefile

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

2023-04-27 16:36:55 -07:00

module_signature.c

…

notifier.c

notifiers: add tracepoints to the notifiers infrastructure

2023-04-08 13:45:38 -07:00

nsproxy.c

convert setns(2) to fdget()/fdput()

2023-04-20 22:55:35 -04:00

padata.c

…

panic.c

cpu: Mark nmi_panic_self_stop() __noreturn

2023-04-14 17:31:26 +02:00

params.c

…

pid_namespace.c

kernel: pid_namespace: simplify sysctls with register_sysctl()

2023-05-02 19:23:29 -07:00

pid_sysctl.h

kernel: pid_namespace: simplify sysctls with register_sysctl()

2023-05-02 19:23:29 -07:00

pid.c

pid: add pidfd_prepare()

2023-04-03 11:16:56 +02:00

profile.c

…

ptrace.c

ptrace: Provide set/get interface for syscall user dispatch

2023-04-16 14:23:07 +02:00

range.c

…

reboot.c

…

regset.c

…

relay.c

relayfs: fix out-of-bounds access in relay_file_read

2023-05-02 17:23:27 -07:00

resource_kunit.c

…

resource.c

…

rseq.c

…

scftorture.c

…

scs.c

…

seccomp.c

seccomp: simplify sysctls with register_sysctl_init()

2023-04-13 11:49:20 -07:00

signal.c

fork, vhost: Use CLONE_THREAD to fix freezer/ps regression

2023-06-01 17:15:33 -04:00

smp.c

trace,smp: Trace all smp_function_call*() invocations

2023-03-24 11:01:30 +01:00

smpboot.c

…

smpboot.h

…

softirq.c

softirq: Add trace points for tasklet entry/exit

2023-04-15 10:17:16 +02:00

stackleak.c

stackleak: allow to specify arch specific stackleak poison function

2023-04-20 11:36:35 +02:00

stacktrace.c

…

static_call_inline.c

…

static_call.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

mm/ksm: unmerge and clear VM_MERGEABLE when setting PR_SET_MEMORY_MERGE=0

2023-05-02 17:21:49 -07:00

sysctl-test.c

…

sysctl.c

mm: compaction: move compaction sysctl to its own file

2023-04-13 11:49:35 -07:00

task_work.c

…

taskstats.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

…

uid16.c

…

uid16.h

…

umh.c

…

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

usermode_driver.c

…

utsname_sysctl.c

utsname: simplify one-level sysctl registration for uts_kern_table

2023-04-13 11:49:35 -07:00

utsname.c

…

vhost_task.c

fork, vhost: Use CLONE_THREAD to fix freezer/ps regression

2023-06-01 17:15:33 -04:00

watch_queue.c

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

2023-04-27 16:36:55 -07:00

watchdog_hld.c

…

watchdog.c

…

workqueue_internal.h

…

workqueue.c

Merge tag 'wq-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2023-04-29 09:48:52 -07:00