linux-kernel - Re: linux-next: manual merge of the drm-misc tree with Linus' 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190524001625.0b6fecf9@canb.auug.org.au>
Date:   Fri, 24 May 2019 00:16:25 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     Maxime Ripard <maxime.ripard@...tlin.com>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jyri Sarha <jsarha@...com>,
        Marco Felsch <m.felsch@...gutronix.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thierry Reding <treding@...dia.com>,
        Sean Paul <seanpaul@...omium.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree

Hi Daniel,

On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter <daniel.vetter@...ll.ch> wrote:
>
> That commit is on top of drm-misc, and somehow the .txt version has
> been resurrect in drm-misc-next (so needs to be re-deleted too).

My mistake, the conflict went away (due to the back merge) so my
scripts assumed the file no longer needed deleting.  I didn't actually
check to see if it was still there.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped