Received-SPF: pass (google.com: domain of linux-kernel+bounces-179270-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 15 May 2024 09:54:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the stm32 tree
Message-ID: <20240515095434.34aa60ef@canb.auug.org.au>
In-Reply-To: <20240514083304.0a8b368b@canb.auug.org.au>
References: <20240430110428.30432b2f@canb.auug.org.au>
	<20240514083304.0a8b368b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/mAn=v9xJ5NGl6X8E47POOmi";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/mAn=v9xJ5NGl6X8E47POOmi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 14 May 2024 08:33:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Tue, 30 Apr 2024 11:04:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
> >
> > The following commits are also in the arm-soc tree as different
> > commits (but the same patches):
> >=20
> >   0087ca056c73 ("arm64: dts: st: add all 8 i2c nodes on stm32mp251")
> >   2886ab7437de ("arm64: dts: st: add rcc support for STM32MP25")
> >   385ca8e3841f ("arm64: dts: st: add spi3 / spi8 properties on stm32mp2=
57f-ev1"
> > )
> >   3e7d579c9fca ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP=
15x boar
> > ds")
> >   4ef09379d765 ("arm64: dts: st: add i2c2 / i2c8 properties on stm32mp2=
57f-ev1"
> > )
> >   5e6b388d7bcb ("ARM: dts: stm32: move can3 node from stm32f746 to stm3=
2f769")
> >   7442597f90ba ("arm64: dts: st: add i2c2/i2c8 pins for stm32mp25")
> >   7c12d95564a2 ("ARM: dts: stm32: add LTDC pinctrl on STM32MP13x SoC fa=
mily")
> >   7c3d4f99a920 ("ARM: dts: stm32: put ETZPC as an access controller for=
 STM32MP
> > 15x boards")
> >   808691f7389d ("media: dt-bindings: add access-controllers to STM32MP2=
5 video=20
> > codecs")
> >   881bccce217e ("ARM: dts: stm32: add LTDC support for STM32MP13x SoC f=
amily")
> >   8fe31699b83d ("bus: stm32_firewall: fix off by one in stm32_firewall_=
get_firewall()")
> >   9e716b41a2b5 ("arm64: dts: st: add RIFSC as an access controller for =
STM32MP25x boards")
> >   a012bd75abf6 ("ARM: dts: stm32: enable display support on stm32mp135f=
-dk board")
> >   aee0ce48516c ("arm64: dts: st: add spi3/spi8 pins for stm32mp25")
> >   be62e9c0c3fc ("bus: etzpc: introduce ETZPC firewall controller driver=
")
> >   c7f2f2c0ace8 ("ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1=
")
> >   cab43766e000 ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP=
13x boards")
> >   d3740a9fd78c ("dt-bindings: display: simple: allow panel-common prope=
rties")
> >   dccdbccb7045 ("arm64: dts: st: correct masks for GIC PPI interrupts o=
n stm32mp25")
> >   de9b447d5678 ("ARM: dts: stm32: put ETZPC as an access controller for=
 STM32MP13x boards")
> >   ede58756bbe5 ("arm64: dts: st: add all 8 spi nodes on stm32mp251")
> >   f798f7079233 ("ARM: dts: stm32: add PWR regulators support on stm32mp=
131") =20
>=20
> Those commits are now duplicates of commits in Linus' tree.

And are now causing unnecessary conflicts in linux-next :-(

--=20
Cheers,
Stephen Rothwell

--Sig_/mAn=v9xJ5NGl6X8E47POOmi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZD+boACgkQAVBC80lX
0GzF9wf/dWUygEjf52Y8WZglnvyYs/xwJooOjUwQuJ8tx0S5mBCYSviFXPB+V4c+
WIivNNJ2k4LTo9tZCtliG7YkK819UYCGFfVIYNoyKE8ZDttHf22Ps+OSTtbH5kT0
sfYS/5hkHw5Q8INiF93u/bhLexXr9eErkrTNOmFNPmu6LJ5OVHuxf6cBsmF8NXHk
DJ8zDRgzds9AKhVI5lWQOe41h/zC9ZsIvmzdVmTvJZJ1c5c5pfLVR+7mfkglhwrT
w5wJDGo2FTQ/ujmknIKbDSXHwoDM06DaJtMSmmCc3J3MLDoJhXH2m3Kw2aj0ixPf
Ds7GHi1AbhYhufExxaW9sS9Y13O+2A==
=QKp/
-----END PGP SIGNATURE-----

--Sig_/mAn=v9xJ5NGl6X8E47POOmi--