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

…

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

…

crypto

…

cxl

…

drm

drm: Fix DSC BPP increment decoding

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

dt-bindings

…

hyperv

…

keys

…

kunit

…

kvm

…

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

…

scsi

…

soc

…

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

…

vdso

…

video

…

xen

…