lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230327173802.0ceb89df@kernel.org> Date: Mon, 27 Mar 2023 17:38:02 -0700 From: Jakub Kicinski <kuba@...nel.org> To: Guo Samin <samin.guo@...rfivetech.com> Cc: <linux-kernel@...r.kernel.org>, <linux-riscv@...ts.infradead.org>, <devicetree@...r.kernel.org>, <netdev@...r.kernel.org>, "David S . Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>, Rob Herring <robh+dt@...nel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>, Emil Renner Berthing <kernel@...il.dk>, Jose Abreu <joabreu@...opsys.com>, Richard Cochran <richardcochran@...il.com>, Conor Dooley <conor@...nel.org>, Paul Walmsley <paul.walmsley@...ive.com>, Palmer Dabbelt <palmer@...belt.com>, Albert Ou <aou@...s.berkeley.edu>, Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>, Peter Geis <pgwipeout@...il.com>, Yanhong Wang <yanhong.wang@...rfivetech.com>, Tommaso Merciai <tomm.merciai@...il.com> Subject: Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac 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.
Powered by blists - more mailing lists