Re: [PATCH v5 2/3] arm64: dts: amlogic: Add A4 Reset Controller

[neil . armstrong]

On 11/04/2025 10:23, Kelvin Zhang wrote:
> Hi Neil,
>
> There’s a conflict in amlogic-a4-common.dtsi due to recent merges.
> Should I rebase onto the latest code and send a v6?

Yes please rebase on top of https://web.git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git/log/?h=v6.16/arm64-dt

Thanks,
Neil

> On 2025/3/24 15:06, Neil Armstrong wrote:
> > On 20/03/2025 10:42, Kelvin Zhang via B4 Relay wrote:
> > > From: Zelong Dong <zelong.dong@xxxxxxxxxxx>
<snip>