Re: linux-next: manual merge of the kspp tree with the powerpc tree

From: Stephen Rothwell
Date: Mon Jul 18 2016 - 08:19:58 EST


Hi Michael,

On Mon, 18 Jul 2016 21:00:05 +1000 Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
>
> > from the powerpc tree and commit:
>
> Actually that's in Scott's tree.

Oops, sorry.

> > Michael: time to sort these selects?
>
> Yeah I was thinking that the other day. Not sure when is a good time though.

Just after -rc1, before you open the powerpc tree up again so most of
the powerpc patches can be based after it. Also a good time to update
the config files if necessary.

--
Cheers,
Stephen Rothwell