Hi all,
On Tue, 14 May 2024 08:33:04 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Tue, 30 Apr 2024 11:04:28 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > The following commits are also in the arm-soc tree as different
> > commits (but the same patches):
> >
> > 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 stm32mp257f-ev1"
> > )
> > 3e7d579c9fca ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boar
> > ds")
> > 4ef09379d765 ("arm64: dts: st: add i2c2 / i2c8 properties on stm32mp257f-ev1"
> > )
> > 5e6b388d7bcb ("ARM: dts: stm32: move can3 node from stm32f746 to stm32f769")
> > 7442597f90ba ("arm64: dts: st: add i2c2/i2c8 pins for stm32mp25")
> > 7c12d95564a2 ("ARM: dts: stm32: add LTDC pinctrl on STM32MP13x SoC family")
> > 7c3d4f99a920 ("ARM: dts: stm32: put ETZPC as an access controller for STM32MP
> > 15x boards")
> > 808691f7389d ("media: dt-bindings: add access-controllers to STM32MP25 video
> > codecs")
> > 881bccce217e ("ARM: dts: stm32: add LTDC support for STM32MP13x SoC family")
> > 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 STM32MP13x boards")
> > d3740a9fd78c ("dt-bindings: display: simple: allow panel-common properties")
> > dccdbccb7045 ("arm64: dts: st: correct masks for GIC PPI interrupts on 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 stm32mp131")
>
> Those commits are now duplicates of commits in Linus' tree.
And are now causing unnecessary conflicts in linux-next :-(
--
Cheers,
Stephen Rothwell
Attachment:
pgp6iXSdt54eu.pgp
Description: OpenPGP digital signature
