From: Jakub Kicinski <kuba@kernel.org>
To: Daniel Golle <daniel@makrotopia.org>
Cc: "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>,
"Conor Dooley" <conor+dt@kernel.org>,
"Felix Fietkau" <nbd@nbd.name>, "John Crispin" <john@phrozen.org>,
"Sean Wang" <sean.wang@mediatek.com>,
"Mark Lee" <Mark-MC.Lee@mediatek.com>,
"Lorenzo Bianconi" <lorenzo@kernel.org>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Russell King" <linux@armlinux.org.uk>,
"Bjørn Mork" <bjorn@mork.no>, "Greg Ungerer" <gerg@kernel.org>,
"Florian Fainelli" <f.fainelli@gmail.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH net-next v5 0/9] net: ethernet: mtk_eth_soc: add basic support for MT7988 SoC
Date: Mon, 24 Jul 2023 16:00:24 -0700 [thread overview]
Message-ID: <20230724160024.427b2bef@kernel.org> (raw)
In-Reply-To: <cover.1690148927.git.daniel@makrotopia.org>
On Sun, 23 Jul 2023 22:57:08 +0100 Daniel Golle wrote:
> The series should not conflict with Russell's recently submitted series
> "Remove legacy phylink behaviour", hence the order of them being
> picked into net-next doesn't matter.
Not sure what the exact conflict is, but:
Failed to apply patch:
Applying: dt-bindings: net: mediatek,net: add missing mediatek,mt7621-eth
Applying: dt-bindings: net: mediatek,net: add mt7988-eth binding
Applying: net: ethernet: mtk_eth_soc: add version in mtk_soc_data
Applying: net: ethernet: mtk_eth_soc: increase MAX_DEVS to 3
Applying: net: ethernet: mtk_eth_soc: rely on MTK_MAX_DEVS and remove MTK_MAC_COUNT
Applying: net: ethernet: mtk_eth_soc: add NETSYS_V3 version support
Applying: net: ethernet: mtk_eth_soc: convert caps in mtk_soc_data struct to u64
Applying: net: ethernet: mtk_eth_soc: convert clock bitmap to u64
Applying: net: ethernet: mtk_eth_soc: add basic support for MT7988 SoC
error: sha1 information is lacking or useless (drivers/net/ethernet/mediatek/mtk_eth_soc.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 net: ethernet: mtk_eth_soc: add basic support for MT7988 SoC
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
pw-bot: cr
next prev parent reply other threads:[~2023-07-24 23:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-23 21:57 [PATCH net-next v5 0/9] net: ethernet: mtk_eth_soc: add basic support for MT7988 SoC Daniel Golle
2023-07-23 21:57 ` [PATCH net-next v5 1/9] dt-bindings: net: mediatek,net: add missing mediatek,mt7621-eth Daniel Golle
2023-07-23 21:57 ` [PATCH net-next v5 2/9] dt-bindings: net: mediatek,net: add mt7988-eth binding Daniel Golle
2023-07-23 21:58 ` [PATCH net-next v5 3/9] net: ethernet: mtk_eth_soc: add version in mtk_soc_data Daniel Golle
2023-07-23 21:58 ` [PATCH net-next v5 4/9] net: ethernet: mtk_eth_soc: increase MAX_DEVS to 3 Daniel Golle
2023-07-23 21:58 ` [PATCH net-next v5 5/9] net: ethernet: mtk_eth_soc: rely on MTK_MAX_DEVS and remove MTK_MAC_COUNT Daniel Golle
2023-07-23 21:59 ` [PATCH net-next v5 6/9] net: ethernet: mtk_eth_soc: add NETSYS_V3 version support Daniel Golle
2023-07-23 21:59 ` [PATCH net-next v5 7/9] net: ethernet: mtk_eth_soc: convert caps in mtk_soc_data struct to u64 Daniel Golle
2023-07-23 21:59 ` [PATCH net-next v5 8/9] net: ethernet: mtk_eth_soc: convert clock bitmap " Daniel Golle
2023-07-23 21:59 ` [PATCH net-next v5 9/9] net: ethernet: mtk_eth_soc: add basic support for MT7988 SoC Daniel Golle
2023-07-24 23:00 ` Jakub Kicinski [this message]
2023-07-25 0:55 ` [PATCH net-next v5 0/9] " Daniel Golle
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=20230724160024.427b2bef@kernel.org \
--to=kuba@kernel.org \
--cc=Mark-MC.Lee@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bjorn@mork.no \
--cc=conor+dt@kernel.org \
--cc=daniel@makrotopia.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=gerg@kernel.org \
--cc=john@phrozen.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=lorenzo@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=robh+dt@kernel.org \
--cc=sean.wang@mediatek.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.