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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAKMK7uGxXxFXLt2m5_3y2a2zi09WyUCkSMTnYQv7doswQZUbqg@mail.gmail.com>
Date:   Fri, 8 Feb 2019 10:34:22 +0100
From:   Daniel Vetter <daniel@...ll.ch>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Dave Airlie <airlied@...ux.ie>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sam Ravnborg <sam@...nborg.org>,
        Chris Wilson <chris@...is-wilson.co.uk>
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm tree

On Fri, Feb 8, 2019 at 10:26 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Daniel,
>
> On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter <daniel@...ll.ch> 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