Hi Ingo, On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar wrote: > > I suspect -next will have to carry this semantic merge conflict > resolution until the DRM tree is merged upstream. Yep, its not a real problem, I get a few like this every cycle. -- Cheers, Stephen Rothwell