From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757215Ab3ANRWb (ORCPT ); Mon, 14 Jan 2013 12:22:31 -0500 Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:19841 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756023Ab3ANRWa (ORCPT ); Mon, 14 Jan 2013 12:22:30 -0500 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19gnoWSBNjes52kjprHCfzb Date: Mon, 14 Jan 2013 09:22:22 -0800 From: Tony Lindgren To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Mark A. Greer" , Herbert Xu Subject: Re: linux-next: manual merge of the arm-soc tree with the crypto tree Message-ID: <20130114172221.GU14149@atomide.com> References: <20130114134908.094003722be0612c20574338@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130114134908.094003722be0612c20574338@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 * Stephen Rothwell [130113 18:52]: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/crypto/omap-sham.c between commit dfd061d5a8f5 ("crypto: > omap-sham - Add code to use dmaengine API") from the crypto tree and > commit a62a6e98c370 ("ARM: OMAP2+: Disable code that currently does not > work with multiplaform") from the arm-soc tree. > > I fixed it up (the former removed the include that the latter protected) > and can carry the fix as necessary (no action is required). Thanks, yes the crypto tree changes fixed up things so the changes coming from arm-soc tree are not needed any longer. Regards, Tony