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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
Date	2016-01-07 21:10 +0100
Message-ID	<qOp2G-4BD-29@gated-at.bofh.it> (permalink)
References	<qGVVL-1qO-7@gated-at.bofh.it> <qOeTE-65o-7@gated-at.bofh.it> <qOmob-2Kl-31@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the akpm-current tree with the  powerpc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-07 10:20 +0100
  Re: linux-next: manual merge of the akpm-current tree with the powerpc tree "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2016-01-07 18:20 +0100
    Re: linux-next: manual merge of the akpm-current tree with the  powerpc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-07 21:10 +0100

csiph-web