Hi,
On Tue, Apr 8, 2025 at 2:17 AM gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 6.14-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@vger.kernel.org.
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.14.y git checkout FETCH_HEAD git cherry-pick -x a5951389e58d2e816eed3dbec5877de9327fd881 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2025040844-unlivable-strum-7c2f@gregkh' --subject-prefix 'PATCH 6.14.y' HEAD^..
FWIW, this patch applies cleanly for me to the top of 6.14.y if you simply apply all 5 patches in the series, all of which are CC stable. AKA these commands work
git checkout v6.14.1 # Current linux-6.14.y git cherry-pick ed1ce841245d~..a5951389e58d
Where you start getting a conflict is if you also take this patch from mainline:
e3121298c7fc arm64: Modify _midr_range() functions to read MIDR/REVIDR internally
The merge conflict between those two series was resolved upstream in:
edb0e8f6e2e1 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
-Doug