From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Lee Jones <lee@kernel.org>
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>,
linux-kernel@vger.kernel.org,
Amarula patchwork <linux-amarula@amarulasolutions.com>,
michael@amarulasolutions.com,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-can@vger.kernel.org, oe-kbuild-all@lists.linux.dev
Subject: Re: [PATCH 1/4] dt-bindings: mfd: stm32f7: add binding definition for CAN3
Date: Wed, 17 May 2023 16:16:52 +0200 [thread overview]
Message-ID: <20230517-corset-pelvis-5b0c41f519c9-mkl@pengutronix.de> (raw)
In-Reply-To: <20230424090229.GB8035@google.com>
[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]
Hey Lee Jones,
On 24.04.2023 10:02:29, Lee Jones wrote:
> On Sun, 23 Apr 2023, Dario Binacchi wrote:
>
> > Add binding definition for CAN3 peripheral.
> >
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > ---
> >
> > include/dt-bindings/mfd/stm32f7-rcc.h | 1 +
> > 1 file changed, 1 insertion(+)
>
> Applied, thanks
I upstreamed the v2 of this series
(https://lore.kernel.org/all/20230427204540.3126234-1-dario.binacchi@amarulasolutions.com/)
that doesn't contain this change to net/main without noticing that the
DT changes in that series depend on it.
This broke the DT compilation of the stm32f746.dtsi in the net/main
tree. I don't see the stm32f7-rcc.h changes in linus/master so I'm
afraid this will break mainline too :/
What are the possible solutions? I see:
1) revert the stm32f746.dtsi changes via net/main
2) upstream the stm32f7-rcc.h changes via net/main, too
3) upstream the stm32f7-rcc.h changes via you tree, so that it hits
mainline in the v6.4 release cycle.
I'm in favor of solution number 1. Thoughts?
Sorry for the mess,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung Nürnberg | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
next prev parent reply other threads:[~2023-05-17 14:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-23 17:25 [PATCH 0/4] can: bxcan: add support for single peripheral configuration Dario Binacchi
2023-04-23 17:25 ` [PATCH 4/4] " Dario Binacchi
2023-04-23 19:16 ` Marc Kleine-Budde
2023-04-24 6:56 ` Dario Binacchi
2023-04-24 10:06 ` Marc Kleine-Budde
2023-04-25 20:10 ` Dario Binacchi
2023-04-24 13:03 ` Simon Horman
[not found] ` <20230423172528.1398158-2-dario.binacchi@amarulasolutions.com>
[not found] ` <20230424090229.GB8035@google.com>
2023-05-17 14:16 ` Marc Kleine-Budde [this message]
2023-05-17 15:23 ` [PATCH 1/4] dt-bindings: mfd: stm32f7: add binding definition for CAN3 Krzysztof Kozlowski
2023-05-17 18:21 ` Marc Kleine-Budde
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=20230517-corset-pelvis-5b0c41f519c9-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=alexandre.torgue@foss.st.com \
--cc=dario.binacchi@amarulasolutions.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=michael@amarulasolutions.com \
--cc=oe-kbuild-all@lists.linux.dev \
--cc=robh+dt@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).