Subject: Re: linux-next: manual merge of the nommu tree

From: Matt Mackall <[email-masked]>
Date: Thu, 08 Jan 2009 01:20:02 -0600

On Thu, 2009-01-08 at 15:30 +1100, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the nommu tree got a conflict in
> mm/tiny-shmem.c between commit 853ac43ab194f5051b27a55060215d696dc9480d
> ("shmem: unify regular and tiny shmem") from Linus' tree and commit
> d10f9907ba3626261f45dbb498867f441f06c486 ("shmem: remove unused
> shmem_get_unmapped_area") from the nommu tree.

Thanks for cleaning this up, but this probably shouldn't have happened.
I wrote the remove patch first, then wrote the unify patch on top of it
and sent them both off, numbered, to Hugh. Not sure how or why they went
through different trees.

-- 
Mathematics is the supreme nostalgia of our time.