mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: neil.armstrong@linaro.org
To: Kelvin Zhang <kelvin.zhang@amlogic.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Kevin Hilman <khilman@baylibre.com>,
	Jerome Brunet <jbrunet@baylibre.com>,
	Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
	Zelong Dong <zelong.dong@amlogic.com>
Subject: Re: [PATCH v5 2/3] arm64: dts: amlogic: Add A4 Reset Controller
Date: Fri, 11 Apr 2025 10:32:25 +0200	[thread overview]
Message-ID: <ab32c7bf-7788-4992-83a9-26963f520455@linaro.org> (raw)
In-Reply-To: <8a0f383f-e100-4928-a040-91ec0aa9aa6f@amlogic.com>

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@amlogic.com>
>>>
<snip>


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

  reply	other threads:[~2025-04-11  8:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-20  9:42 [PATCH v5 0/3] Add support for Amlogic A4/A5 Reset Kelvin Zhang via B4 Relay
2025-03-20  9:42 ` [PATCH v5 1/3] dt-bindings: reset: Add compatible for Amlogic A4/A5 Reset Controller Kelvin Zhang via B4 Relay
2025-03-20  9:42 ` [PATCH v5 2/3] arm64: dts: amlogic: Add A4 " Kelvin Zhang via B4 Relay
2025-03-24  7:06   ` Neil Armstrong
2025-04-11  8:23     ` Kelvin Zhang
2025-04-11  8:32       ` neil.armstrong [this message]
2025-03-20  9:42 ` [PATCH v5 3/3] arm64: dts: amlogic: Add A5 " Kelvin Zhang via B4 Relay
2025-03-24  7:06   ` Neil Armstrong
2025-05-05 12:38 ` [PATCH v5 0/3] Add support for Amlogic A4/A5 Reset Neil Armstrong
2025-04-11 11:27 Kelvin Zhang via B4 Relay
2025-04-11 11:27 ` [PATCH v5 2/3] arm64: dts: amlogic: Add A4 Reset Controller Kelvin Zhang via B4 Relay

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ab32c7bf-7788-4992-83a9-26963f520455@linaro.org \
    --to=neil.armstrong@linaro.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jbrunet@baylibre.com \
    --cc=kelvin.zhang@amlogic.com \
    --cc=khilman@baylibre.com \
    --cc=krzk+dt@kernel.org \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=p.zabel@pengutronix.de \
    --cc=robh@kernel.org \
    --cc=zelong.dong@amlogic.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®