[GIT PULL] Linux support for ARM LPAE
Russell King - ARM Linux
linux at arm.linux.org.uk
Wed Dec 7 15:29:12 EST 2011
On Wed, Dec 07, 2011 at 12:25:44PM +0000, Catalin Marinas wrote:
> ARM: pgtable: Fix compiler warning in ioremap.c introduced by nopud
> From: Catalin Marinas <catalin.marinas at arm.com>
> With the arch/arm code conversion to pgtable-nopud.h, the section and
> supersection (un|re)map code triggers compiler warnings on UP systems.
> This is caused by pmd_offset() being given a pgd_t argument rather than
> a pud_t one. This patch makes the necessary conversion via pud_alloc()
> and pmd_alloc().
> Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
So, do I now take this email as you saying that _your_ LPAE tree is
not ready for merging because you want to rework this patch, or what?
Because you've decided to go down the path of reworking this patch,
I consider it dangerous for me to just pull from your tree again - I've
no idea what I'd get, and I've no idea whether what's there is what you
want me to merge.
So, this is causing extra delay, and there's nothing _I_ can do about
it at my end.
This is getting completely out of hand.
What I want from you - by 5pm tomorrow so I can get this stuff merged -
is a pull request for the LPAE stuff as it was in your v2 pull request,
either based on top of _either_ my devel-stable (if you can get it - as
the machine is having severe problems running git atm) or with Will's
idmap changes merged into it _before_ the LPAE changes.
I suspect you'll have to do the latter though, because I don't think I
can sort out git on the server at the moment.
More information about the linux-arm-kernel