linux-kernel - Re: linux-next: manual merge of the tpmdd tree with the crypto 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: <YoyyghV5pEOJre4/@gondor.apana.org.au>
Date:   Tue, 24 May 2022 18:25:06 +0800
From:   Herbert Xu <herbert@...dor.apana.org.au>
To:     Jarkko Sakkinen <jarkko@...nel.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Crypto List <linux-crypto@...r.kernel.org>,
        Ahmad Fatoum <a.fatoum@...gutronix.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Meenakshi Aggarwal <meenakshi.aggarwal@....com>,
        Steffen Trumtrar <s.trumtrar@...gutronix.de>
Subject: Re: linux-next: manual merge of the tpmdd tree with the crypto tree

On Mon, May 23, 2022 at 10:57:21PM +0300, Jarkko Sakkinen wrote:
>
> Herbert, so I pulled the whole patch set. How should we work out this?

Just send a note about the potential conflict to Linus when you
create the pull request.  He'll sort it out.

Cheers,
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt