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

[James Morris]

On Mon, 8 Feb 2016, David Howells wrote:

> Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxx>