Hi Aneesh, On Thu, 07 Jan 2016 22:45:19 +0530 "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> wrote: > > Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes: > > > This merge fix up patch now looks like this: > > > What about the #define pfn_pte part ? We don't need that now ? That is done as part of the merge conflict resolution. This is an extra needed merge resolution patch due to code being moved between files. You can see the entire merge resolution using git diff-tree --cc 5a028bd9b7de in next-20160107. The #defines are there in arch/powerpc/include/asm/book3s/32/pgtable.h arch/powerpc/include/asm/book3s/64/hash.h arch/powerpc/include/asm/nohash/pgtable.h -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
