[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1454966757.3037.41.camel@linux.vnet.ibm.com>
Date: Mon, 08 Feb 2016 16:25:57 -0500
From: Mimi Zohar <zohar@...ux.vnet.ibm.com>
To: David Howells <dhowells@...hat.com>
Cc: Herbert Xu <herbert@...dor.apana.org.au>, jmorris@...ei.org,
Tadeusz Struk <tadeusz.struk@...el.com>,
linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org, linux-crypto@...r.kernel.org
Subject: Re: Transferring applied X.509 patches from crypto/next to
security/next
Hi Herbert,
On Mon, 2016-02-08 at 13:58 +0000, 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?
Could we upstream these patches via James' tree? If you re-base these
patches on top of the James' security-next branch and send him a pull
request, we can then base on our patches on top of them.
Mimi
Powered by blists - more mailing lists