]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'ath-next-20260105' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath
authorJohannes Berg <johannes.berg@intel.com>
Thu, 8 Jan 2026 12:30:50 +0000 (13:30 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 8 Jan 2026 12:32:01 +0000 (13:32 +0100)
Jeff Johnson says:
==================
ath.git patches for v6.20

Propagate the "Next Generation" of the ath12k driver to wireless-next.

NOTE TO MAINTAINERS:
There is a conflict between this tree and the MHI tree. This conflict
has already been resolved by Stephen Rothwell in linux-next. Please
refer to his resolution comments in:

https://lore.kernel.org/all/20260105154243.7cd5d049@canb.auug.org.au/
==================

Link: https://patch.msgid.link/4ba3aecf-5194-48e3-a112-31da3a8646aa@oss.qualcomm.com/
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Trivial merge