Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210719095150.75af9e42@canb.auug.org.au>
In-Reply-To: <20210719095150.75af9e42@canb.auug.org.au>
From:   Joel Stanley <joel@jms.id.au>
Date:   Mon, 19 Jul 2021 00:15:25 +0000
Message-ID: <CACPK8XfQ9nAr=tsCsce6Bf4HAtWZ+bAVAhx4tBkwYahurpi0Eg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the aspeed tree with Linus' tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Andrew Jeffery <andrew@aj.id.au>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sun, 18 Jul 2021 at 23:52, Stephen Rothwell <sfr@canb.auug.org.au> 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