[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <ab32c7bf-7788-4992-83a9-26963f520455@linaro.org>
Date: Fri, 11 Apr 2025 10:32:25 +0200
From: neil.armstrong@...aro.org
To: Kelvin Zhang <kelvin.zhang@...ogic.com>,
Philipp Zabel <p.zabel@...gutronix.de>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley
<conor+dt@...nel.org>, Kevin Hilman <khilman@...libre.com>,
Jerome Brunet <jbrunet@...libre.com>,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>
Cc: devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-amlogic@...ts.infradead.org, linux-kernel@...r.kernel.org,
Zelong Dong <zelong.dong@...ogic.com>
Subject: Re: [PATCH v5 2/3] arm64: dts: amlogic: Add A4 Reset Controller
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@...ogic.com>
>>>
<snip>
Powered by blists - more mailing lists