Re: linux-next: manual merge of the risc-v tree with the arm64 tree

Will Deacon
2019-08-13T08:54:01Z

On Tue, Aug 13, 2019 at 06:42:11PM +1000, Stephen Rothwell wrote:
> On Tue, 13 Aug 2019 09:24:23 +0100 Will Deacon <will@kernel.org> wrote:
> >
> > Paul, Palmer -- If it's not too late, then it would probably be best to
> > stick this commit (60c1b220d8bc) and any dependencies on their own stable
> > branch so that we can both pull it into our respective trees and I can
> > resolve this conflict in the arm64 tree, which I'll send early during the
> > merge window.
> >
> > Looking at your tree, I guess I could just pull in
> > common/for-v5.4-rc1/cpu-topology if you promise never to rebase it. Failing
> > that, you could fork a new branch from 60c1b220d8bc and I could just pull
> > that part instead.
>
> It may not be worth it, the conflict is not that bad. Unless you
> forsee more conflicts arising.

Hopefully not, but it looks like it should be dead easy to resolve in this
case since the riscv tree doesn't contain anything else and the arm64 stuff
is already on its own branch.

I'll leave it up to Paul/Palmer to see what they prefer.

Will