From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932982AbcCHQsS (ORCPT ); Tue, 8 Mar 2016 11:48:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43941 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635AbcCHQsL (ORCPT ); Tue, 8 Mar 2016 11:48:11 -0500 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 From: David Howells In-Reply-To: <20160308165612.54c8dd50@canb.auug.org.au> References: <20160308165612.54c8dd50@canb.auug.org.au> <20160307131834.70da82d4@canb.auug.org.au> <28626.1457348905@warthog.procyon.org.uk> To: Stephen Rothwell Cc: dhowells@redhat.com, Herbert Xu , David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <13170.1457455687.1@warthog.procyon.org.uk> Date: Tue, 08 Mar 2016 16:48:07 +0000 Message-ID: <13171.1457455687@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell 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