Hi Ingo, On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar <mingo@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html