* linux-next: manual merge of the akpm tree with the tiny tree
@ 2014-09-23 7:48 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-23 7:48 UTC (permalink / raw)
To: Andrew Morton, Josh Triplett; +Cc: linux-next, linux-kernel, Kirill A. Shutemov
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
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@canb•auug.org.au
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-23 7:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-23 7:48 linux-next: manual merge of the akpm tree with the tiny tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox