linux-kernel - Re: Transferring applied X.509 patches from crypto/next to security/next

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: <alpine.LRH.2.20.1602091200580.6966@namei.org>
Date:	Tue, 9 Feb 2016 12:01:19 +1100 (AEDT)
From:	James Morris <jmorris@...ei.org>
To:	David Howells <dhowells@...hat.com>
cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	Tadeusz Struk <tadeusz.struk@...el.com>,
	linux-kernel@...r.kernel.org,
	linux-security-module@...r.kernel.org,
	linux-crypto@...r.kernel.org, zohar@...ux.vnet.ibm.com
Subject: Re: Transferring applied X.509 patches from crypto/next to
 security/next

On Mon, 8 Feb 2016, David Howells wrote:

> Herbert Xu <herbert@...dor.apana.org.au> wrote:
> 
> > > Hmmm...  That means that the crypto branch and the security branch are going
> > > to conflict.
> > 
> > I thought you were OK with it going in now as you said that you'll
> > fix it up later.  Sorry for the misunderstanding.  Do you want me to
> > revert?
> 
> If you can back them out, I'll apply them to my keys-next branch.  Unless
> James is willing to rebase security/next on top of your crypto branch?
> 

I don't want to rebase my tree.


-- 
James Morris
<jmorris@...ei.org>