Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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.
I've updated the nommu tree.
David
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
