breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-01-12 00:42:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2dc7bfd677fc454668eb5bf0eab74ea35691040
linux/kernel
History
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
..
bpf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-04-04 18:01:07 -07:00
cgroup
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
configs
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
debug
…
dma
Merge tag 'dma-mapping-6.9-2024-03-24' of git://git.infradead.org/users/hch/dma-mapping
2024-03-24 10:45:31 -07:00
entry
entry: Respect changes to system call number by trace_sys_enter()
2024-03-12 13:23:32 +01:00
events
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
futex
…
gcov
…
irq
genirq: Introduce IRQF_COND_ONESHOT and use it in pinctrl-amd
2024-03-25 23:45:21 +01:00
kcsan
…
livepatch
…
locking
locking/rtmutex: Use try_cmpxchg_relaxed() in mark_rt_mutex_waiters()
2024-03-01 13:02:05 +01:00
module
Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2024-03-25 10:48:23 -07:00
power
Merge tag 'rtc-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2024-03-21 17:16:46 -07:00
printk
Merge tag 'printk-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
2024-03-26 09:25:57 -07:00
rcu
Merge branches 'rcu-doc.2024.02.14a', 'rcu-nocb.2024.02.14a', 'rcu-exp.2024.02.14a', 'rcu-tasks.2024.02.26a' and 'rcu-misc.2024.02.14a' into rcu.2024.02.26a
2024-02-26 17:37:25 -08:00
sched
Merge tag 'riscv-for-linus-6.9-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
2024-03-22 10:41:13 -07:00
time
Fix memory leak in posix_clock_open()
2024-03-27 09:03:22 -07:00
trace
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-04-04 18:01:07 -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
bounds: support non-power-of-two CONFIG_NR_CPUS
2024-02-22 15:38:51 -08:00
capability.c
…
cfi.c
…
compat.c
…
configs.c
…
context_tracking.c
…
cpu_pm.c
…
cpu.c
Merge tag 'x86-apic-2024-03-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2024-03-11 15:45:55 -07:00
crash_core.c
crash: split crash dumping code out from kexec_core.c
2024-02-23 17:48:22 -08:00
crash_reserve.c
crash: use macro to add crashk_res into iomem early for specific arch
2024-03-26 11:14:12 -07:00
cred.c
cred: Use KMEM_CACHE() instead of kmem_cache_create()
2024-02-23 17:33:31 -05:00
delayacct.c
…
dma.c
…
elfcorehdr.c
crash: remove dependency of FA_DUMP on CRASH_DUMP
2024-02-23 17:48:22 -08:00
exec_domain.c
…
exit.c
Merge tag 'vfs-6.9.pidfd' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
2024-03-11 10:21:06 -07:00
exit.h
…
extable.c
…
fail_function.c
…
fork.c
Merge tag 'rcu.next.v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/boqun/linux
2024-03-11 12:02:50 -07:00
freezer.c
…
gen_kheaders.sh
…
groups.c
…
hung_task.c
kernel/hung_task.c: export sysctl_hung_task_timeout_secs
2024-03-13 21:22:04 -04:00
iomem.c
…
irq_work.c
…
jump_label.c
…
kallsyms_internal.h
…
kallsyms_selftest.c
mm/vmalloc: remove vmap_area_list
2024-02-23 17:48:19 -08:00
kallsyms_selftest.h
…
kallsyms.c
…
kcmp.c
…
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.kexec
crash: clean up kdump related config items
2024-02-23 17:48:22 -08:00
Kconfig.locks
…
Kconfig.preempt
…
kcov.c
…
kexec_core.c
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
kexec_elf.c
…
kexec_file.c
arm64, crash: wrap crash dumping code into crash related ifdefs
2024-02-23 17:48:23 -08:00
kexec_internal.h
crash: remove dependency of FA_DUMP on CRASH_DUMP
2024-02-23 17:48:22 -08:00
kexec.c
crash: split crash dumping code out from kexec_core.c
2024-02-23 17:48:22 -08:00
kheaders.c
…
kprobes.c
…
ksyms_common.c
…
ksysfs.c
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
kthread.c
…
latencytop.c
…
Makefile
crash: split crash dumping code out from kexec_core.c
2024-02-23 17:48:22 -08:00
module_signature.c
…
notifier.c
…
nsproxy.c
pidfd: add pidfs
2024-03-01 12:23:37 +01:00
numa.c
…
padata.c
Author: Gang Li padata: dispatch works on
2024-03-06 13:04:17 -08:00
panic.c
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
params.c
…
pid_namespace.c
…
pid_sysctl.h
…
pid.c
pidfs: remove config option
2024-03-13 12:53:53 -07:00
profile.c
…
ptrace.c
ptrace_attach: shift send(SIGSTOP) into ptrace_set_stopped()
2024-02-22 15:38:52 -08:00
range.c
…
reboot.c
…
regset.c
…
relay.c
…
resource_kunit.c
…
resource.c
…
rseq.c
…
scftorture.c
…
scs.c
…
seccomp.c
…
signal.c
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
smp.c
…
smpboot.c
…
smpboot.h
…
softirq.c
workqueue: Drain BH work items on hot-unplugged CPUs
2024-02-29 11:51:24 -10:00
stackleak.c
…
stacktrace.c
…
static_call_inline.c
…
static_call.c
…
stop_machine.c
…
sys_ni.c
…
sys.c
prctl: generalize PR_SET_MDWE support check to be per-arch
2024-03-26 11:07:22 -07:00
sysctl-test.c
…
sysctl.c
tracing: Support to dump instance traces by ftrace_dump_on_oops
2024-03-18 10:33:06 -04: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_namespace: remove unnecessary NULL values from kbuf
2024-02-22 15:38:52 -08:00
user-return-notifier.c
…
user.c
…
usermode_driver.c
…
utsname_sysctl.c
…
utsname.c
…
vhost_task.c
…
vmcore_info.c
crash_core: export vmemmap when CONFIG_SPARSEMEM_VMEMMAP is enabled
2024-03-04 17:01:27 -08:00
watch_queue.c
…
watchdog_buddy.c
…
watchdog_perf.c
…
watchdog.c
watchdog/core: remove sysctl handlers from public header
2024-03-12 13:09:23 -07:00
workqueue_internal.h
…
workqueue.c
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