[GIT PULL] STM32 DT fixes for v5.19 #2

[Arnd Bergmann]

On Fri, Jul 1, 2022 at 2:05 PM Alexandre TORGUE
<alexandre.torgue at foss.st.com> wrote:
>
> Hi ARM SoC maintainers,
>
> Please consider this second round of STM32 DT fixes for v5.19 cycle. It
> mainly concerns fixes for SCMI version of ST boards introduced in v5.19-rc1.
>
> The following changes since commit ea3414e1249ea35bc02debe28d4cbfeb6261657c:
>
>    ARM: dts: stm32: move SCMI related nodes in a dedicated file for
> stm32mp15 (2022-06-07 17:22:21 +0200)
>
> are available in the Git repository at:

Hi Alex,

I get a merge conflict because I had picked up the "ARM: dts: stm32: move SCMI
related nodes in a dedicated file for stm32mp15" commit from the mailing
list, so it now has a different commit ID from the one you are based on.

As far as I can tell, the patches are identical, but since the files
are modified
further in your tree, this confuses the git merge algorithm and leads to a
somewhat ugly git history with two identical commits if I fix it up.

Can you rebase this pull request on top of v5.19-rc4 and resend?
(note: don't rebase the non-fixes pull requests unless you have to).

      Arnd