Johannes Berg a0efa2f362 Merge net-next/main to resolve conflicts ...

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2024-10-09 08:59:22 +02:00

..

acpi

…

asm-generic

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

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

clocksource

…

crypto

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

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

cxl

…

drm

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

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

dt-bindings

Merge tag 'soc-ep93xx-dt-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2024-09-26 12:00:25 -07:00

keys

KEYS: Remove unused declarations

2024-09-20 18:28:26 +03:00

kunit

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2024-09-23 15:01:48 -07:00

kvm

…

linux

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

math-emu

…

media

…

memory

…

misc

…

net

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

pcmcia

…

ras

…

rdma

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

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

rv

…

scsi

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

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

soc

…

sound

…

target

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

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

trace

Merge tag 'vfs-6.12-rc2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

2024-09-30 10:59:44 -07:00

uapi

net_sched: sch_fq: add the ability to offload pacing

2024-10-04 15:37:54 -07:00

ufs

Merge tag 'mm-nonmm-stable-2024-09-21-07-52' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-09-21 08:20:50 -07:00

vdso

…

video

…

xen

xen: sync elfnote.h from xen tree

2024-09-25 14:15:04 +02:00