From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191Ab2EGERC (ORCPT ); Mon, 7 May 2012 00:17:02 -0400 Received: from sting.hengli.com.au ([178.18.18.71]:56623 "EHLO fornost.hengli.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750874Ab2EGERB (ORCPT ); Mon, 7 May 2012 00:17:01 -0400 Date: Mon, 7 May 2012 14:16:54 +1000 From: Herbert Xu To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Westin , Linus Walleij , Lee Jones , Arnd Bergmann Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree Message-ID: <20120507041654.GA25039@gondor.apana.org.au> References: <20120507121137.bdfc96ed31649040506d9c75@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120507121137.bdfc96ed31649040506d9c75@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 On Mon, May 07, 2012 at 12:11:37PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got conflicts in > arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c > between commit b024a0c80435 ("ARM: ux500: move top level platform devices > in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be > ("mach-ux500: crypto - core support for CRYP/HASH module") from the > crypto tree. > > Just context changes. I fixed them up (see below) and can carry the > fixes as necessary. I think it looks fine but I'll let Linus Walleij have the final say on this. Thanks! -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt