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.
The former removed the file and so have I.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5fr59HUVLS.pgp
Description: PGP signature
