Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/Makefile
between commit d3ac21cacc24 ("mm: Support compiling out madvise and
fadvise") from the tiny tree and commit "mm: replace remap_file_pages()
syscall with emulation" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc mm/Makefile
index f8ed7ab417b1,20ff8c39d064..000000000000
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -3,7 -3,7 +3,7 @@@
#
mmu-y := nommu.o
- mmu-$(CONFIG_MMU) := fremap.o gup.o highmem.o memory.o mincore.o \
-mmu-$(CONFIG_MMU) := gup.o highmem.o madvise.o memory.o mincore.o \
++mmu-$(CONFIG_MMU) := gup.o highmem.o memory.o mincore.o \
mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
vmalloc.o pagewalk.o pgtable-generic.o
Attachment:
signature.asc
Description: PGP signature
