Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933398AbbHLFSq (ORCPT ); Wed, 12 Aug 2015 01:18:46 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:48599 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753873AbbHLFSo (ORCPT ); Wed, 12 Aug 2015 01:18:44 -0400 Date: Wed, 12 Aug 2015 13:18:30 +0800 From: Herbert Xu To: Stephen Rothwell Cc: Shawn Guo , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Victoria Milhoan , Shengjiu Wang Subject: Re: linux-next: manual merge of the crypto tree with the imx-mxs tree Message-ID: <20150812051830.GB6258@gondor.apana.org.au> References: <20150812132239.0ce1fe80@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150812132239.0ce1fe80@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 932 Lines: 29 On Wed, Aug 12, 2015 at 01:22:39PM +1000, Stephen Rothwell wrote: > > Today's linux-next merge of the crypto tree got a conflict in: > > arch/arm/configs/imx_v6_v7_defconfig > > between commit: > > 351265f46291 ("ARM: imx_v6_v7_defconfig: build in audio driver") > > from the imx-mxs tree and commit: > > ab86ca0755ec ("ARM: imx_v6_v7_defconfig: Select CAAM") > > from the crypto tree. > > I fixed it up (they both removed the same line) and can carry the fix > as necessary (no action is required). Thanks Stephen. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/