linux-kernel - Re: [git pull] drm for 5.13-rc1

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wh22MOMM5Paw-dHVvkp6W+UKx8mv_TNJ1TY9iaAMS1rLQ@mail.gmail.com>
Date:   Wed, 28 Apr 2021 10:07:23 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Dave Airlie <airlied@...il.com>
Cc:     Daniel Vetter <daniel.vetter@...ll.ch>,
        dri-devel <dri-devel@...ts.freedesktop.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm for 5.13-rc1

On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie <airlied@...il.com> wrote:
>
> There aren't a massive amount of conflicts, only with vmwgfx when I
> did a test merge into your master yesterday, I think you should be
> able to handle them yourself, but let me know if you want me to push a
> merged tree somewhere (or if I missed something).

The conflict was easy enough to resolve, but was unusual in that my
tree had vmwgfx fixes that weren't in the development tree (ie that
commit 2ef4fb92363c: "drm/vmwgfx: Make sure bo's are unpinned before
putting them back").

Usually when I merge stuff, I can see that the fixes that were pushed
to my tree are also in the development branch. Not so this time.

          Linus