* Stephen Rothwell <s...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/