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

[Stephen Rothwell]

Hi Ingo,

On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar <mingo at 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.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20191010/5f89a795/attachment.sig>