[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <25680.1454939914@warthog.procyon.org.uk>
Date: Mon, 08 Feb 2016 13:58:34 +0000
From: David Howells <dhowells@...hat.com>
To: Herbert Xu <herbert@...dor.apana.org.au>
Cc: dhowells@...hat.com, 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, zohar@...ux.vnet.ibm.com
Subject: Transferring applied X.509 patches from crypto/next to security/next
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?
David
Powered by blists - more mailing lists