lkml.org 
[lkml]   [2016]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: Transferring applied X.509 patches from crypto/next to security/next
On Mon, 8 Feb 2016, David Howells wrote:

> Herbert Xu <herbert@gondor.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@namei.org>

\
 
 \ /
  Last update: 2016-02-09 02:21    [W:0.281 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site