Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Thu, 12 Oct 2023 09:28:47 +0200
From:   Marc Kleine-Budde <mkl@pengutronix.de>
To:     Shawn Guo <shawnguo@kernel.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Networking <netdev@vger.kernel.org>, Frank Li <Frank.Li@nxp.com>,
        Haibo Chen <haibo.chen@nxp.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the net tree
Message-ID: <20231012-giveaway-cider-963ce91b73cf-mkl@pengutronix.de>
References: <20231012101434.1e5e7340@canb.auug.org.au>
 <20231012004356.GR819755@dragon>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="yptlk7dor5hap4t3"
Content-Disposition: inline
In-Reply-To: <20231012004356.GR819755@dragon>
Precedence: bulk


--yptlk7dor5hap4t3
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 12.10.2023 08:43:56, Shawn Guo wrote:
> On Thu, Oct 12, 2023 at 10:14:34AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >=20
> > Today's linux-next merge of the imx-mxs tree got a conflict in:
> >=20
> >   arch/arm64/boot/dts/freescale/imx93.dtsi
> >=20
> > between commit:
> >=20
> >   23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR")
>=20
> Marc,
>=20
> Is there any particular reason why this dts change needs to go via net
> tree?  Otherwise, could you drop it from net and let it go via i.MX tree?

As far as I understand the problem, the imx93 A0 silicon was supposed to
have a functional auto-stop mode for the flexcan peripheral. But wakeup
stress tests show that it doesn't work reliable. So this and the
following patch switched the imx93 back to the "old" stop-mode via GPR,
which needs a DT update.

| 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR")
| 63ead535570f ("can: flexcan: remove the auto stop mode for IMX93")

See the description of 63ead535570f for more details.

Marc

--=20
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung N=C3=BCrnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |

--yptlk7dor5hap4t3
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEDs2BvajyNKlf9TJQvlAcSiqKBOgFAmUnoCsACgkQvlAcSiqK
BOhqxAf/TR6JyrXcR2gU8M5fJLeDnX0Zlc2BMNkHrzylitpeLN9peBKaPdK4WLo/
9EfPAWZn08z3d41N9mKFRwHTc5K/d9dz/eqYMqkiXHm6zIKjSRLASNQWdlhO29Uy
CUTiz3GTK3DbQOzkVASfNpmaH/CTb42Nf66lfbRD85J4fPRKjoDiJhkDRGJlLheO
5Bhky1pm5l8oNZaFfcH6LMeC75Qk+3Z1FW4Pbta5xsDE8b1LpgoaPuLvkK+BTDcD
mdenpyH4XM/zx4nVZvaOLaL9DSY0lVOVWKVQtUbmRtcWOGclccU835SJo8oGWqmZ
wq5I5ErI1HHytNZvt7FzLpDr2TE10Q==
=Ylvq
-----END PGP SIGNATURE-----

--yptlk7dor5hap4t3--