linux-kernel - Re: linux-next: manual merge of the efi-lock-down tree with the modules 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: <25950.1523951172@warthog.procyon.org.uk>
Date:   Tue, 17 Apr 2018 08:46:12 +0100
From:   David Howells <dhowells@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     dhowells@...hat.com, Jessica Yu <jeyu@...nel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jia Zhang <zhang.jia@...ux.alibaba.com>
Subject: Re: linux-next: manual merge of the efi-lock-down tree with the modules tree

Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the efi-lock-down tree got a conflict in:

Can you drop my branch for the moment?

Thanks,
David