Re: linux-next: manual merge of the drm-misc tree with the drm tree

[Daniel Vetter]

On Fri, Feb 8, 2019 at 10:26 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Daniel,
>
> On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter <daniel@xxxxxxxx> wrote:
> >
> > There isn't a "below" afaics ....
>
> Oops :-(  However the merge diff is not very enlightening in this case
> anyway.  It makes more sense to look at the final result when I finish
> up in a while.

Yeah conflict isn't too bad either, and we have it in the drm rr-cache
already. So not worried, just wanted to check whether there's more.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch