Hi Ingo, On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar <mi...@kernel.org> wrote: > > I only had that patch for testing and it went into the -next branch by > accident - > I have removed it so the conflict should be gone next time -next is > integrated.
Thanks, these things happen. -- Cheers, Stephen Rothwell