Re: FAILED: patch "[PATCH] arm64: dts: rockchip: Disable DMA for uart5 on px30-ringneck" failed to apply to 6.6-stable tree

[Quentin Schulz <quentin.schulz@cherry.de>]

Hi Greg, Heiko, Lukasz,

On 2/24/25 11:27 AM, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 6.6-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.6.y
> git checkout FETCH_HEAD
> git cherry-pick -x 5ae4dca718eacd0a56173a687a3736eb7e627c77
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025022438-automated-recycled-cc12@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
> 
> Possible dependencies:
> 

Commit 5ae4dca718ea ("arm64: dts: rockchip: Disable DMA for uart5 on 
px30-ringneck") depends on 4eee627ea593 ("arm64: dts: rockchip: Move 
uart5 pin configuration to px30 ringneck SoM"), both slated for stable, 
so I'm surprised this patch is the one conflicting and not the first one 
(because it does conflict too!).

An option for clean application is to backport 5963d97aa780 ("arm64: 
dts: rockchip: add rs485 support on uart5 of px30-ringneck-haikou") to 
6.6 first, and then 4eee627ea593 followed by 5ae4dca718ea.

Another option is to resolve the conflict for 4eee627ea593 which is 
simply about the git context (rts-gpios can be removed if 5963d97aa780 
isn't backported).

@Heiko, @Greg, a preference on one of those two options (or a third one 
maybe?)? I personally would prefer the additional backport so we avoid 
other conflicts in the future (I already foresee one with a patch I 
posted (not merged yet!) last week).

Cheers,
Quentin