Re: linux-next: manual merge of the akpm-current tree with the powerpc tree

Stephen Rothwell
2016-01-07T20:03:34Z

Hi Aneesh,

On Thu, 07 Jan 2016 22:45:19 +0530 "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au