On Tue, Feb 09, 2016 at 03:43:00PM +, David Howells wrote:
> Herbert Xu wrote:
>
> > > > 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 reba
Herbert Xu wrote:
> > > 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.
>
> OK, I've just reverted the patches and pushed it out.
Thanks. Can I
On Tue, Feb 09, 2016 at 12:01:19PM +1100, James Morris wrote:
> >
> > 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.
OK, I've just reverted the patches a
On Mon, 8 Feb 2016, David Howells wrote:
> Herbert Xu 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 misunderstan
Hi Herbert,
On Mon, 2016-02-08 at 13:58 +, David Howells wrote:
> Herbert Xu 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.
Herbert Xu 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
