From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: "Cristian Ciocaltea" <cristian.ciocaltea@collabora.com>,
"Tan Chun Hau" <chunhau.tan@starfivetech.com>,
"David S . Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Emil Renner Berthing" <kernel@esmil.dk>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
"Simon Horman" <horms@kernel.org>,
"Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>,
"Andrew Halaney" <ahalaney@redhat.com>,
"Jisheng Zhang" <jszhang@kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Russell King" <rmk+kernel@armlinux.org.uk>
Cc: Ley Foon Tan <leyfoon.tan@starfivetech.com>,
Jee Heng Sia <jeeheng.sia@starfivetech.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org
Subject: Re: [PATCH v2 1/1] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support
Date: Thu, 11 Jan 2024 19:15:02 +0100 [thread overview]
Message-ID: <3c552324-2ebf-41c2-b310-70341ebfdd9a@linaro.org> (raw)
In-Reply-To: <59bb488f-f2ad-44b0-87fa-206ae3b1c33f@collabora.com>
On 11/01/2024 19:07, Cristian Ciocaltea wrote:
> On 1/11/24 04:55, Tan Chun Hau wrote:
>> Add StarFive JH8100 dwmac support.
>> JH8100 dwmac has one reset signal instead of 2 resets as in JH7110.
>>
>> Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com>
>> ---
>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
>> .../bindings/net/starfive,jh7110-dwmac.yaml | 50 +++++++++++++------
>> 2 files changed, 37 insertions(+), 14 deletions(-)
>
> [...]
>
> Please note this is going to conflict with the about-to-be-merged changes
They weren't picked up, so how they can be merged? If you mean applied,
then you suggest your patchset has some kind of preference, but this
needs explanation why.
Best regards,
Krzysztof
next prev parent reply other threads:[~2024-01-11 18:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 2:55 [PATCH v2 0/1] Add StarFive JH8100 dwmac support Tan Chun Hau
2024-01-11 2:55 ` [PATCH v2 1/1] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support Tan Chun Hau
2024-01-11 8:04 ` Krzysztof Kozlowski
2024-01-11 18:07 ` Cristian Ciocaltea
2024-01-11 18:15 ` Krzysztof Kozlowski [this message]
2024-01-11 18:19 ` Cristian Ciocaltea
2024-01-11 8:02 ` [PATCH v2 0/1] Add StarFive JH8100 dwmac support Krzysztof Kozlowski
2024-01-11 8:03 ` Krzysztof Kozlowski
2024-01-11 10:00 ` ChunHau Tan
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=3c552324-2ebf-41c2-b310-70341ebfdd9a@linaro.org \
--to=krzysztof.kozlowski@linaro.org \
--cc=ahalaney@redhat.com \
--cc=alexandre.torgue@foss.st.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=chunhau.tan@starfivetech.com \
--cc=conor+dt@kernel.org \
--cc=cristian.ciocaltea@collabora.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jeeheng.sia@starfivetech.com \
--cc=jszhang@kernel.org \
--cc=kernel@esmil.dk \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=leyfoon.tan@starfivetech.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/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