Re: linux-next: manual merge of the aspeed tree with Linus' tree

[Joel Stanley]

On Sun, 18 Jul 2021 at 23:52, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the aspeed tree got a conflict in:
>
>   arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
>
> between commit:
>
>   faffd1b2bde3 ("ARM: dts: everest: Add phase corrections for eMMC")
>
> from Linus' tree and commit:
>
>   315cc563d047 ("ARM: dts: everest: Add phase corrections for eMMC")
>
> from the aspeed tree.

Thanks, I've rebased the newer patch on the older one and pushed it
out, so we should be good to go tomorrow.

Cheers,

Joel