From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753389Ab2IDIIe (ORCPT <rfc822;w@1wt.eu>);
	Tue, 4 Sep 2012 04:08:34 -0400
Received: from moutng.kundenserver.de ([212.227.126.186]:59146 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751048Ab2IDIIb (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 4 Sep 2012 04:08:31 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
Date: Tue, 4 Sep 2012 08:08:24 +0000
User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; )
Cc: Olof Johansson <olof@lixom.net>, linux-arm-kernel@lists.infradead.org,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Rob Herring <rob.herring@calxeda.com>,
        Russell King <rmk@arm.linux.org.uk>
References: <20120904160626.f1dcb67ebbb145053c49da8c@canb.auug.org.au>
In-Reply-To: <20120904160626.f1dcb67ebbb145053c49da8c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Message-Id: <201209040808.25103.arnd@arndb.de>
X-Provags-ID: V02:K0:gVRMDGrn+7wzc3Ollj9HisIJhKKBM+4qjlqOmJ/Vvef
 KXEiwON70R0myLzXgtA8L/FdnktyPaWNaUMtk9xKkdT1ZUzCZr
 NzonDEhwoQUkirgA97RBzaYile5Q/SFYkbMYi/6JpfwnmFgMLy
 1IxoPwqzatGKCxGv5rtucjM+yEYUiXQMGaJd5NsTXjTuIj/AcZ
 7a8o1fC+WiMl+DUR46i2vu/VcZH67PeFfpL2DRYyXyGCtQ00ep
 /NEJWMXdOCaoWR8/iZEm+im1Ma4eW3qSbBp4E756yPA1D4S5Z3
 Hww5MEXov16kZ9dFZNqHMtQq9ouhnP/eh0lbTNzy9KheTuZxl4
 QmJFRAwqOpoud6Dv1Bjc=
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tuesday 04 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
> address zero") from the arm-current tree and commit c2794437091a ("ARM:
> Add fixed PCI i/o mapping") from the arm-soc tree.
> 
> I am not sure how to fix this, so I have used the arm-current version of
> the change to pmd_empty_section_gap() since that changed the vm->flags.
> It may be that just changing the vm->flags value in vm_reserve_area_early()
> would be ok?

If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
want to add a flag argument to the vm_reserve_area_early() function.

	Arnd