Re: linux-next: build failure after merge of the tip tree

Daniel Vetter
2019-10-10T13:45:05Z

On Thu, Oct 10, 2019 at 10:23:21PM +1100, Stephen Rothwell wrote:
> Hi Ingo,
>
> On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar <mingo@kernel.org> 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.

Yeah totally within expectations when I acked that cleanup patch. We'll
probably have a few more lockdep annotation patches/changes that will
conflict in drm.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation