From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752271AbcCGLIf (ORCPT ); Mon, 7 Mar 2016 06:08:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58590 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108AbcCGLI2 convert rfc822-to-8bit (ORCPT ); Mon, 7 Mar 2016 06:08:28 -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: <20160307131834.70da82d4@canb.auug.org.au> References: <20160307131834.70da82d4@canb.auug.org.au> 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: <28625.1457348905.1@warthog.procyon.org.uk> Content-Transfer-Encoding: 8BIT Date: Mon, 07 Mar 2016 11:08:25 +0000 Message-ID: <28626.1457348905@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? David