Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933432Ab2EQDWs (ORCPT ); Wed, 16 May 2012 23:22:48 -0400 Received: from sting.hengli.com.au ([178.18.18.71]:49490 "EHLO fornost.hengli.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760940Ab2EQDWr (ORCPT ); Wed, 16 May 2012 23:22:47 -0400 Date: Thu, 17 May 2012 13:22:36 +1000 From: Herbert Xu To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Westin , Kent Yoder , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: Re: linux-next: manual merge of the crypto tree with the powerpc tree Message-ID: <20120517032236.GA11236@gondor.apana.org.au> References: <20120517132116.8a5378bce254fc39d20cb08a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120517132116.8a5378bce254fc39d20cb08a@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 903 Lines: 22 On Thu, May 17, 2012 at 01:21:16PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in > drivers/crypto/Kconfig between commit aef7b31c8833 ("powerpc/crypto: > Build files for the nx device driver") from the powerpc tree and commit > 2789c08fffea ("crypto: ux500 - Add driver for CRYP hardware") from the > crypto tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Looks fine. 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/