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

Cross-merge networking fixes after downstream PR (net-6.12-rc7).

Conflicts:

drivers/net/ethernet/freescale/enetc/enetc_pf.c
  e15c5506dd ("net: enetc: allocate vf_state during PF probes")
  3774409fd4 ("net: enetc: build enetc_pf_common.c as a separate module")
https://lore.kernel.org/20241105114100.118bd35e@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/ti/am65-cpsw-nuss.c
  de794169cf ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7")
  4a7b2ba94a ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version")

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

2024-11-07 13:44:16 -08:00

..

bpf

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

2024-10-31 14:56:19 -10:00

cgroup

cgroup: Fix potential overflow issue when checking max_depth

2024-10-14 13:39:25 -10:00

configs

configs/debug: make sure PROVE_RCU_LIST=y takes effect

2024-10-28 10:21:09 -07:00

debug

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

dma

dma-mapping: report unlimited DMA addressing in IOMMU DMA path

2024-09-23 08:38:56 +02:00

entry

…

events

perf: Fix missing RCU reader protection in perf_event_clear_cpumask()

2024-10-23 20:52:25 +02:00

futex

fault-inject: improve build for CONFIG_FAULT_INJECTION=n

2024-09-01 20:43:33 -07:00

gcov

…

irq

genirq/msi: Fix off-by-one error in msi_domain_alloc()

2024-10-27 10:40:47 +01:00

kcsan

…

livepatch

…

locking

Merge tag 'locking-urgent-2024-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2024-09-29 08:51:30 -07:00

module

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

2024-09-28 09:06:15 -07:00

power

[tree-wide] finally take no_llseek out

2024-09-27 08:18:43 -07:00

printk

Merge tag 'drm-next-2024-09-19' of https://gitlab.freedesktop.org/drm/kernel

2024-09-19 10:18:15 +02:00

rcu

Merge branch 'linus' into sched/urgent, to resolve conflict

2024-10-17 09:58:07 +02:00

sched

Merge tag 'sched-urgent-2024-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2024-11-03 08:18:28 -10:00

time

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

2024-10-24 16:43:50 -07:00

trace

tracing: Document tracefs gid mount option

2024-11-01 08:57:17 -04:00

.gitignore

…

acct.c

…

async.c

…

audit_fsnotify.c

…

audit_tree.c

…

audit_watch.c

…

audit.c

audit: Make use of str_enabled_disabled() helper

2024-09-03 16:35:16 -04:00

audit.h

…

auditfilter.c

audit: use task_tgid_nr() instead of task_pid_nr()

2024-08-28 16:48:28 -04:00

auditsc.c

audit: use task_tgid_nr() instead of task_pid_nr()

2024-08-28 16:48:28 -04:00

backtracetest.c

…

bounds.c

…

capability.c

…

cfi.c

…

compat.c

…

configs.c

…

context_tracking.c

context_tracking, rcu: Rename rcu_dyntick trace event into rcu_watching

2024-08-15 21:30:43 +05:30

cpu_pm.c

…

cpu.c

Merge tag 'timers-core-2024-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2024-09-17 07:25:37 +02:00

crash_core.c

Document/kexec: generalize crash hotplug description

2024-09-01 20:43:37 -07:00

crash_reserve.c

crash: fix crash memory reserve exceed system memory bug

2024-09-01 20:43:30 -07:00

cred.c

…

delayacct.c

…

dma.c

…

elfcorehdr.c

…

exec_domain.c

…

exit.c

Merge tag 'mm-stable-2024-09-20-02-31' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-09-21 07:29:05 -07:00

exit.h

…

extable.c

…

fail_function.c

…

fork.c

Merge tag 'timers-urgent-2024-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2024-11-03 08:22:21 -10:00

freezer.c

sched/fair: Fix external p->on_rq users

2024-10-14 09:14:35 +02:00

gen_kheaders.sh

…

groups.c

…

hung_task.c

…

iomem.c

…

irq_work.c

…

jump_label.c

jump_label: Fix static_key_slow_dec() yet again

2024-09-10 11:57:27 +02:00

kallsyms_internal.h

…

kallsyms_selftest.c

kallsyms: Match symbols exactly with CONFIG_LTO_CLANG

2024-08-15 09:33:35 -07:00

kallsyms_selftest.h

…

kallsyms.c

kallsyms: Match symbols exactly with CONFIG_LTO_CLANG

2024-08-15 09:33:35 -07:00

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.kexec

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

Merge tag 'x86-build-2024-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2024-09-17 12:40:34 +02:00

kexec_core.c

…

kexec_elf.c

…

kexec_file.c

kexec_file: fix elfcorehdr digest exclusion when CONFIG_CRASH_HOTPLUG=y

2024-09-01 17:59:01 -07:00

kexec_internal.h

kexec: use atomic_try_cmpxchg_acquire() in kexec_trylock()

2024-09-01 20:43:23 -07:00

kexec.c

…

kheaders.c

…

kprobes.c

…

ksyms_common.c

…

ksysfs.c

…

kthread.c

kthread: unpark only parked kthread

2024-10-09 12:47:19 -07:00

latencytop.c

…

Makefile

mm: move kernel/numa.c to mm/

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

module_signature.c

…

notifier.c

…

nsproxy.c

introduce fd_file(), convert all accessors to it.

2024-08-12 22:00:43 -04:00

padata.c

Merge tag 'v6.12-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-09-16 06:28:28 +02:00

panic.c

Merge tag 'drm-next-2024-09-19' of https://gitlab.freedesktop.org/drm/kernel

2024-09-19 10:18:15 +02:00

params.c

…

pid_namespace.c

…

pid_sysctl.h

…

pid.c

introduce fd_file(), convert all accessors to it.

2024-08-12 22:00:43 -04:00

profile.c

…

ptrace.c

…

range.c

…

reboot.c

…

regset.c

…

relay.c

[tree-wide] finally take no_llseek out

2024-09-27 08:18:43 -07:00

resource_kunit.c

resource, kunit: fix user-after-free in resource_test_region_intersects()

2024-10-09 12:47:19 -07:00

resource.c

resource,kexec: walk_system_ram_res_rev must retain resource flags

2024-10-28 21:40:40 -07:00

rseq.c

…

scftorture.c

…

scs.c

…

seccomp.c

…

signal.c

Revert "binfmt_elf, coredump: Log the reason of the failed core dumps"

2024-09-26 11:39:02 -07:00

smp.c

smp: print only local CPU info when sched_clock goes backward

2024-08-15 00:06:48 +05:30

smpboot.c

…

smpboot.h

…

softirq.c

softirq: Remove unused 'action' parameter from action callback

2024-08-20 17:13:40 +02:00

stackleak.c

…

stacktrace.c

…

static_call_inline.c

static_call: Replace pointless WARN_ON() in static_call_module_notify()

2024-09-06 16:29:22 +02:00

static_call.c

…

stop_machine.c

rcu: Rename rcu_momentary_dyntick_idle() into rcu_momentary_eqs()

2024-08-15 21:30:42 +05:30

sys_ni.c

…

sys.c

Merge tag 'pull-stable-struct_fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2024-09-23 09:35:36 -07:00

sysctl-test.c

…

sysctl.c

…

task_work.c

sched/core: Disable page allocation in task_tick_mm_cid()

2024-10-11 10:49:32 +02:00

taskstats.c

introduce fd_file(), convert all accessors to it.

2024-08-12 22:00:43 -04:00

torture.c

…

tracepoint.c

tracepoint: Support iterating tracepoints in a loading module

2024-09-25 23:23:44 +09:00

tsacct.c

…

ucount.c

…

uid16.c

…

uid16.h

…

umh.c

…

up.c

…

user_namespace.c

user_namespace: use kmemdup_array() instead of kmemdup() for multiple allocation

2024-09-09 16:47:42 -07:00

user-return-notifier.c

…

user.c

uidgid: make sure we fit into one cacheline

2024-09-12 12:16:09 +02:00

usermode_driver.c

…

utsname_sysctl.c

…

utsname.c

…

vhost_task.c

…

vmcore_info.c

mm: support only one page_type per page

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

watch_queue.c

introduce fd_file(), convert all accessors to it.

2024-08-12 22:00:43 -04:00

watchdog_buddy.c

…

watchdog_perf.c

…

watchdog.c

watchdog: handle the ENODEV failure case of lockup_detector_delay_init() separately

2024-09-01 20:43:32 -07:00

workqueue_internal.h

…

workqueue.c

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

2024-09-18 06:59:44 +02:00