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

There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

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

2025-03-18 09:46:36 +01:00

..

acpi

Merge tag 'loongarch-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

2025-01-28 08:52:01 -08:00

asm-generic

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

2025-03-01 13:44:51 -08:00

clocksource

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2025-01-28 09:01:36 -08:00

crypto

crypto: skcipher - document skcipher_walk_done() and rename some vars

2025-01-14 11:38:32 +08:00

cxl

cxl/events: Update Memory Module Event Record to CXL spec rev 3.1

2025-01-13 09:33:21 -07:00

drm

drm: Fix DSC BPP increment decoding

2025-02-13 10:20:30 +02:00

dt-bindings

dt-bindings: clock: qcom: Add CAMCC clocks for QCS8300

2025-02-02 20:59:04 -06:00

hyperv

hyperv: Add new Hyper-V headers in include/hyperv

2025-01-10 00:54:20 +00:00

keys

keys: drop shadowing dead prototype

2025-01-21 11:25:23 +02:00

kunit

Merge tag 'linux_kselftest-kunit-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

2025-01-22 12:32:39 -08:00

kvm

Merge branch kvm-arm64/pkvm-memshare-declutter into kvmarm-master/next

2025-01-17 11:05:18 +00:00

linux

net: phy: drop phy_settings and the associated lookup helpers

2025-03-18 09:03:11 +01:00

math-emu

…

media

…

memory

…

misc

…

net

Merge net-next/main to resolve conflicts

2025-03-18 09:46:36 +01:00

pcmcia

…

ras

…

rdma

…

rv

rv: Reset per-task monitors also for idle tasks

2025-01-23 12:16:04 -05:00

scsi

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

2025-01-28 12:25:12 -08:00

soc

Merge tag 'soc-drivers-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2025-01-24 14:56:59 -08:00

sound

ASoC: cs35l56: Prevent races when soft-resetting using SPI control

2025-02-25 15:06:58 +00:00

target

…

trace

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

2025-02-27 10:20:58 -08:00

uapi

Merge net-next/main to resolve conflicts

2025-03-18 09:46:36 +01:00

ufs

scsi: ufs: core: Fix use-after free in init error and remove paths

2025-02-03 17:20:01 -05:00

vdso

vdso: Correct typo in PAGE_SHIFT comment

2025-01-15 11:07:08 +01:00

video

…

xen

…