Re: linux-next: manual merge of the crypto tree with the net-next tree

From	David Howells <dhowells@redhat.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the crypto tree with the net-next tree
Date	2016-03-08 17:50 +0100
Message-ID	<rasZA-3on-11@gated-at.bofh.it> (permalink)
References	<raiQz-55u-17@gated-at.bofh.it> <r9SW5-4YY-1@gated-at.bofh.it> <ra1d0-24s-15@gated-at.bofh.it> <raiQz-55u-17@gated-at.bofh.it>
Organization	Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903

Show all headers | View raw

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> > What's the best way to deal with this?  Should I take Herbert's
> > 
> > 	[PATCH 18/26] rxrpc: Use skcipher
> > 
> > patch into my rxrpc tree also and pass it on to Dave?
> 
> Linus can deal with it when he merges the latter of the crypto or
> net-next trees.  It might be worth a mention in the respective pull
> requests.

Do you mean I should take it - or just let Linus merge it?

I tried to apply the rxrpc skcipher patch to net-next, but
skcipher_request_zero() isn't available there or in any of the patches in the
series.

David

Thread

linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-07 03:20 +0100
  Re: linux-next: manual merge of the crypto tree with the net-next tree David Howells <dhowells@redhat.com> - 2016-03-07 12:10 +0100
    Re: linux-next: manual merge of the crypto tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-08 07:00 +0100
      Re: linux-next: manual merge of the crypto tree with the net-next tree David Howells <dhowells@redhat.com> - 2016-03-08 17:50 +0100
        Re: linux-next: manual merge of the crypto tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-08 22:30 +0100

csiph-web