Hi Ingo,

On Sat, 24 Dec 2016 11:15:08 +0100 Ingo Molnar <mi...@kernel.org> wrote:
>
> Yeah, we'll handle it - that's why the final chunk of changes were left to 
> after 
> -rc1, to not cause such merge conflicts upstream.

Excellent, thanks.

> For now I've excluded the relevant -tip side commits from the linux-next 
> branch.

Well, there probably won't be any linux-next releases until Jan 3, so that's ok.

-- 
Cheers,
Stephen Rothwell

Reply via email to