From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbcAGUDe (ORCPT ); Thu, 7 Jan 2016 15:03:34 -0500 Received: from ozlabs.org ([103.22.144.67]:33174 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbcAGUDc (ORCPT ); Thu, 7 Jan 2016 15:03:32 -0500 Date: Fri, 8 Jan 2016 07:03:30 +1100 From: Stephen Rothwell To: "Aneesh Kumar K.V" Cc: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the akpm-current tree with the powerpc tree Message-ID: <20160108070330.0a2fcb89@canb.auug.org.au> In-Reply-To: <87ziwhpazc.fsf@linux.vnet.ibm.com> References: <20151218163351.5bfd2def@canb.auug.org.au> <20160107201503.6d5ec159@canb.auug.org.au> <87ziwhpazc.fsf@linux.vnet.ibm.com> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Aneesh, On Thu, 07 Jan 2016 22:45:19 +0530 "Aneesh Kumar K.V" wrote: > > Stephen Rothwell 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