Messages in this thread | | | Date | Sun, 21 Oct 2012 18:29:40 +0200 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all, > > Today's linux-next merge of the tip tree got a conflict in > mm/huge_memory.c between commit 325adeb55e32 ("mm: huge_memory: Fix build > error") from Linus' tree and commit 39d6cb39a817 ("mm/mpol: Use special > PROT_NONE to migrate pages") from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Ok, this conflict should go away the next time you integrate linux-next.
Thanks,
Ingo
| |