From: Jakub Kicinski <kuba@kernel.org>
To: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Cc: Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Richard Cochran <richardcochran@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Vinod Koul <vkoul@kernel.org>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Jose Abreu <joabreu@synopsys.com>, Chen-Yu Tsai <wens@kernel.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Matthew Gerlach <matthew.gerlach@altera.com>,
Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Keguang Zhang <keguang.zhang@gmail.com>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Jan Petrous <jan.petrous@oss.nxp.com>,
s32@nxp.com, Romain Gantois <romain.gantois@bootlin.com>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
Heiko Stuebner <heiko@sntech.de>,
Chen Wang <unicorn_wang@outlook.com>,
Inochi Amaoto <inochiama@gmail.com>,
Emil Renner Berthing <kernel@esmil.dk>,
Minda Chen <minda.chen@starfivetech.com>,
Drew Fustini <fustini@kernel.org>, Guo Ren <guoren@kernel.org>,
Fu Wei <wefu@redhat.com>,
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Magnus Damm <magnus.damm@gmail.com>,
Maxime Ripard <mripard@kernel.org>,
Shuang Liang <liangshuang@eswincomputing.com>,
Zhi Li <lizhi2@eswincomputing.com>,
Shangjuan Wei <weishangjuan@eswincomputing.com>,
"G. Jaya Kumaran" <vineetha.g.jaya.kumaran@intel.com>,
Clark Wang <xiaoning.wang@nxp.com>,
Linux Team <linux-imx@nxp.com>, Frank Li <Frank.Li@nxp.com>,
David Wu <david.wu@rock-chips.com>,
Samin Guo <samin.guo@starfivetech.com>,
Christophe Roullier <christophe.roullier@foss.st.com>,
Swathi K S <swathi.ks@samsung.com>,
Bartosz Golaszewski <brgl@kernel.org>,
Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
Drew Fustini <dfustini@tenstorrent.com>,
linux-sunxi@lists.linux.dev, linux-amlogic@lists.infradead.org,
linux-mips@vger.kernel.org, imx@lists.linux.dev,
linux-renesas-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org, sophgo@lists.linux.dev,
linux-riscv@lists.infradead.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>,
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Subject: Re: [PATCH net-next v7 0/7] net: stmmac: qcom-ethqos: add support for SCMI power domains
Date: Fri, 6 Mar 2026 19:43:28 -0800 [thread overview]
Message-ID: <20260306194328.238d89ff@kernel.org> (raw)
In-Reply-To: <20260306-qcom-sa8255p-emac-v7-0-d6a3013094b7@oss.qualcomm.com>
On Fri, 06 Mar 2026 16:46:38 +0100 Bartosz Golaszewski wrote:
> Add support for the firmware-managed variant of the DesignWare MAC on
> the sa8255p platform. This series contains new DT bindings and driver
> changes required to support the MAC in the STMMAC driver.
>
> It also reorganizes the ethqos code quite a bit to make the introduction
> of power domains into the driver a bit easier on the eye.
>
> The DTS changes will go in separately.
Looks like it conflicts with patches merged last night, please rebase
Applying: dt-bindings: net: qcom: document the ethqos device for SCMI-based systems
Applying: net: stmmac: qcom-ethqos: use generic device properties
Using index info to reconstruct a base tree...
M drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
Recorded preimage for 'drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties
next prev parent reply other threads:[~2026-03-07 3:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-06 15:46 [PATCH net-next v7 0/7] net: stmmac: qcom-ethqos: add support for SCMI power domains Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 1/7] dt-bindings: net: qcom: document the ethqos device for SCMI-based systems Bartosz Golaszewski
2026-03-07 10:25 ` Krzysztof Kozlowski
2026-03-09 8:39 ` Bartosz Golaszewski
2026-03-09 9:49 ` Krzysztof Kozlowski
2026-03-06 15:46 ` [PATCH net-next v7 2/7] net: stmmac: qcom-ethqos: use generic device properties Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 3/7] net: stmmac: qcom-ethqos: wrap emac driver data in additional structure Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 4/7] net: stmmac: qcom-ethqos: split power management fields into a separate structure Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 5/7] net: stmmac: qcom-ethqos: split power management context into a separate struct Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 6/7] net: stmmac: qcom-ethqos: define a callback for setting the serdes speed Bartosz Golaszewski
2026-03-06 15:46 ` [PATCH net-next v7 7/7] net: stmmac: qcom-ethqos: add support for sa8255p Bartosz Golaszewski
2026-03-07 3:43 ` Jakub Kicinski [this message]
2026-03-10 1:10 ` [PATCH net-next v7 0/7] net: stmmac: qcom-ethqos: add support for SCMI power domains Radu Rendec
2026-03-10 8:58 ` Bartosz Golaszewski
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=20260306194328.238d89ff@kernel.org \
--to=kuba@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=bartosz.golaszewski@linaro.org \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=brgl@kernel.org \
--cc=christophe.roullier@foss.st.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=david.wu@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=dfustini@tenstorrent.com \
--cc=edumazet@google.com \
--cc=festevam@gmail.com \
--cc=fustini@kernel.org \
--cc=geert+renesas@glider.be \
--cc=guoren@kernel.org \
--cc=heiko@sntech.de \
--cc=imx@lists.linux.dev \
--cc=inochiama@gmail.com \
--cc=jan.petrous@oss.nxp.com \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@gmail.com \
--cc=joabreu@synopsys.com \
--cc=keguang.zhang@gmail.com \
--cc=kernel@esmil.dk \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=konrad.dybcio@oss.qualcomm.com \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=krzysztof.kozlowski@oss.qualcomm.com \
--cc=liangshuang@eswincomputing.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=lizhi2@eswincomputing.com \
--cc=magnus.damm@gmail.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=matthew.gerlach@altera.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=minda.chen@starfivetech.com \
--cc=mohd.anwar@oss.qualcomm.com \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=nobuhiro.iwamatsu.x90@mail.toshiba \
--cc=pabeni@redhat.com \
--cc=peppe.cavallaro@st.com \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=romain.gantois@bootlin.com \
--cc=s.hauer@pengutronix.de \
--cc=s32@nxp.com \
--cc=samin.guo@starfivetech.com \
--cc=samuel@sholland.org \
--cc=shawnguo@kernel.org \
--cc=sophgo@lists.linux.dev \
--cc=swathi.ks@samsung.com \
--cc=unicorn_wang@outlook.com \
--cc=vineetha.g.jaya.kumaran@intel.com \
--cc=vkoul@kernel.org \
--cc=wefu@redhat.com \
--cc=weishangjuan@eswincomputing.com \
--cc=wens@kernel.org \
--cc=xiaoning.wang@nxp.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