From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753931AbcCHF4V (ORCPT ); Tue, 8 Mar 2016 00:56:21 -0500 Received: from ozlabs.org ([103.22.144.67]:50268 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbcCHF4P (ORCPT ); Tue, 8 Mar 2016 00:56:15 -0500 Date: Tue, 8 Mar 2016 16:56:12 +1100 From: Stephen Rothwell To: David Howells Cc: 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 Message-ID: <20160308165612.54c8dd50@canb.auug.org.au> In-Reply-To: <28626.1457348905@warthog.procyon.org.uk> References: <20160307131834.70da82d4@canb.auug.org.au> <28626.1457348905@warthog.procyon.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi David, On Mon, 07 Mar 2016 11:08:25 +0000 David Howells wrote: > > Stephen Rothwell wrote: > > > Today's linux-next merge of the crypto tree got a conflict in: > > > > net/rxrpc/rxkad.c > > > > between commit: > > > > 0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header in host byte order") > > > > from the net-next tree and commit: > > > > 1afe593b4239 ("rxrpc: Use skcipher") > > > > from the crypto tree. > > 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. -- Cheers, Stephen Rothwell