The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 21ae74e1bf18331ae5e279bd96304b3630828009 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061313-wistful-dipping-5d5b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 21ae74e1bf18 ("wifi: ath10k: fix QCOM_RPROC_COMMON dependency") d03407183d97 ("wifi: ath10k: fix QCOM_SMEM dependency") 4d79f6f34bbb ("wifi: ath10k: Store WLAN firmware version in SMEM image table") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
