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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACPK8XfQ9nAr=tsCsce6Bf4HAtWZ+bAVAhx4tBkwYahurpi0Eg@mail.gmail.com>
Date:   Mon, 19 Jul 2021 00:15:25 +0000
From:   Joel Stanley <joel@....id.au>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Jeffery <andrew@...id.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the aspeed tree with Linus' tree

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