From: Jakub Kicinski <kuba@kernel.org>
To: Guo Samin <samin.guo@starfivetech.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-riscv@lists.infradead.org>,
<devicetree@vger.kernel.org>, <netdev@vger.kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Emil Renner Berthing <kernel@esmil.dk>,
Jose Abreu <joabreu@synopsys.com>,
Richard Cochran <richardcochran@gmail.com>,
Conor Dooley <conor@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>, Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Peter Geis <pgwipeout@gmail.com>,
Yanhong Wang <yanhong.wang@starfivetech.com>,
Tommaso Merciai <tomm.merciai@gmail.com>
Subject: Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
Date: Mon, 27 Mar 2023 17:38:02 -0700 [thread overview]
Message-ID: <20230327173802.0ceb89df@kernel.org> (raw)
In-Reply-To: <b20de6ba-3087-2214-eea2-bdd111d9dcbc@starfivetech.com>
On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote:
> Thanks, I will resent with [PATCH net-next v9].
> My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch.
>
> [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com
> [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com
>
> Do I need to remove their context?
If the conflict is just on MAINTAINERS it should be safe to ignore.
Resend your patches on top of net-next as if their patches didn't
exist. Stephen/Linus will have not trouble resolving the conflict.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
WARNING: multiple messages have this Message-ID (diff)
From: Jakub Kicinski <kuba@kernel.org>
To: Guo Samin <samin.guo@starfivetech.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-riscv@lists.infradead.org>,
<devicetree@vger.kernel.org>, <netdev@vger.kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Emil Renner Berthing <kernel@esmil.dk>,
Jose Abreu <joabreu@synopsys.com>,
Richard Cochran <richardcochran@gmail.com>,
Conor Dooley <conor@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>, Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Peter Geis <pgwipeout@gmail.com>,
Yanhong Wang <yanhong.wang@starfivetech.com>,
Tommaso Merciai <tomm.merciai@gmail.com>
Subject: Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
Date: Mon, 27 Mar 2023 17:38:02 -0700 [thread overview]
Message-ID: <20230327173802.0ceb89df@kernel.org> (raw)
In-Reply-To: <b20de6ba-3087-2214-eea2-bdd111d9dcbc@starfivetech.com>
On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote:
> Thanks, I will resent with [PATCH net-next v9].
> My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch.
>
> [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com
> [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com
>
> Do I need to remove their context?
If the conflict is just on MAINTAINERS it should be safe to ignore.
Resend your patches on top of net-next as if their patches didn't
exist. Stephen/Linus will have not trouble resolving the conflict.
next prev parent reply other threads:[~2023-03-28 0:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 1/6] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 2/6] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 3/6] dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-25 2:24 ` Jakub Kicinski
2023-03-25 2:24 ` Jakub Kicinski
2023-03-27 1:53 ` Guo Samin
2023-03-27 1:53 ` Guo Samin
2023-03-28 0:38 ` Jakub Kicinski [this message]
2023-03-28 0:38 ` Jakub Kicinski
2023-03-28 1:28 ` Guo Samin
2023-03-28 1:28 ` Guo Samin
2023-03-28 11:57 ` Krzysztof Kozlowski
2023-03-28 11:57 ` Krzysztof Kozlowski
2023-03-24 2:28 ` [PATCH v8 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings Samin Guo
2023-03-24 2:28 ` Samin Guo
2023-03-24 13:59 ` Emil Renner Berthing
2023-03-24 13:59 ` Emil Renner Berthing
2023-03-27 1:29 ` Guo Samin
2023-03-27 1:29 ` Guo Samin
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=20230327173802.0ceb89df@kernel.org \
--to=kuba@kernel.org \
--cc=andrew@lunn.ch \
--cc=aou@eecs.berkeley.edu \
--cc=conor@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=joabreu@synopsys.com \
--cc=kernel@esmil.dk \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=pgwipeout@gmail.com \
--cc=richardcochran@gmail.com \
--cc=robh+dt@kernel.org \
--cc=samin.guo@starfivetech.com \
--cc=tomm.merciai@gmail.com \
--cc=yanhong.wang@starfivetech.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.