From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757719Ab1FQKRa (ORCPT ); Fri, 17 Jun 2011 06:17:30 -0400 Received: from service87.mimecast.com ([94.185.240.25]:42523 "HELO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752777Ab1FQKR1 convert rfc822-to-8bit (ORCPT ); Fri, 17 Jun 2011 06:17:27 -0400 Date: Fri, 17 Jun 2011 11:17:17 +0100 From: Catalin Marinas To: Stephen Rothwell Cc: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Russell King Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree Message-ID: <20110617101717.GB9504@e102109-lin.cambridge.arm.com> References: <20110617102637.7868bc00.sfr@canb.auug.org.au> MIME-Version: 1.0 In-Reply-To: <20110617102637.7868bc00.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 17 Jun 2011 10:17:20.0560 (UTC) FILETIME=[BE15EB00:01CC2CD7] X-MC-Unique: 111061711172400601 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Fri, Jun 17, 2011 at 01:26:37AM +0100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-lpae tree got a conflict in > arch/arm/mm/dma-mapping.c between commit 8f5d638883e0 ("ARM: DMA: steal > memory for DMA coherent mappings") from the arm tree and commit > 7b550c77c248 ("ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*") > from the arm-lpae tree. > > The former has removed all the references to the PGDIR_* macros from this > file, so I used that. The fix is correct. I also did a kernel build for Versatile Express and there were no errors. Thanks. -- Catalin