linux-kernel - Re: [git pull] drm for v4.13

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: <CA+55aFwhZczEA2MPqnMb0AWsOdE354jTLfegDpGuEUZEFOfiFw@mail.gmail.com>
Date:   Sun, 9 Jul 2017 20:02:27 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Dave Airlie <airlied@...il.com>
Cc:     dri-devel <dri-devel@...ts.freedesktop.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm for v4.13

On Sun, Jul 9, 2017 at 8:01 PM, Dave Airlie <airlied@...il.com> wrote:
>
> Forgot to add, because I just checked now, there are 2 conflicts,
> the drm one with patches from Al, and one in i915_gem_execbuffer.c
> which I think resolves best by just taking the code from the pull in place
> of code in your tree.

Heh. I pulled things over an hour ago, and yes, there were two
conflicts, both trivial.

                Linus