From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Josh Triplett <josh@joshtriplett•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Subject: linux-next: manual merge of the akpm tree with the tiny tree
Date: Tue, 23 Sep 2014 17:48:03 +1000 [thread overview]
Message-ID: <20140923174803.1c20314b@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2014-09-23 7:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140923174803.1c20314b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=josh@joshtriplett$(echo .)org \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox