From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751209AbeFCJWK (ORCPT ); Sun, 3 Jun 2018 05:22:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:60688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862AbeFCJWJ (ORCPT ); Sun, 3 Jun 2018 05:22:09 -0400 Date: Sun, 3 Jun 2018 11:21:45 +0200 From: Greg Kroah-Hartman To: Christophe Leroy Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 4.14 2/4] powerpc/mm/slice: create header files dedicated to slices Message-ID: <20180603092145.GA10556@kroah.com> References: <170bd2b5b5cb1e474599165e8f21f121225a2df9.1527755908.git.christophe.leroy@c-s.fr> <798b787d74d94b5d29f1c0279bad157b6b5df7ec.1527755908.git.christophe.leroy@c-s.fr> <20180602132107.GH31493@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jun 02, 2018 at 10:55:31PM +0200, Christophe Leroy wrote: > > > On 06/02/2018 03:21 PM, Greg Kroah-Hartman wrote: > > On Thu, May 31, 2018 at 08:54:52AM +0000, Christophe Leroy wrote: > > > [ Upstream commit a3286f05bc5a5bc7fc73a9783ec89de78fcd07f8 ] > > > > > > In preparation for the following patch which will enhance 'slices' > > > for supporting PPC32 in order to fix an issue on hugepages on 8xx, > > > this patch takes out of page*.h all bits related to 'slices' and put > > > them into newly created slice.h header files. > > > While common parts go into asm/slice.h, subarch specific > > > parts go into respective books3s/64/slice.c and nohash/64/slice.c > > > 'slices' > > > > > > Signed-off-by: Christophe Leroy > > > Reviewed-by: Nicholas Piggin > > > Signed-off-by: Michael Ellerman > > > --- > > > arch/powerpc/include/asm/book3s/64/slice.h | 27 ++++++++++++++ > > > arch/powerpc/include/asm/nohash/64/slice.h | 12 ++++++ > > > arch/powerpc/include/asm/page.h | 1 + > > > arch/powerpc/include/asm/page_64.h | 59 ------------------------------ > > > arch/powerpc/include/asm/slice.h | 40 ++++++++++++++++++++ > > > 5 files changed, 80 insertions(+), 59 deletions(-) > > > create mode 100644 arch/powerpc/include/asm/book3s/64/slice.h > > > create mode 100644 arch/powerpc/include/asm/nohash/64/slice.h > > > create mode 100644 arch/powerpc/include/asm/slice.h > > > > This patch does not apply :( > > I tried again, it applies well for me: > > [root@localhost linux-stable]# git checkout v4.14.47 -b 4.14.47 > Checking out files: 100% (27111/27111), done. > Switched to a new branch '4.14.47' > [root@localhost linux-stable]# git am /root/Downloads/4.14-1-4-powerpc-mm-slice-Remove-intermediate-bitmap-copy.patch > > Applying: powerpc/mm/slice: Remove intermediate bitmap copy > Applying: powerpc/mm/slice: create header files dedicated to slices > Applying: powerpc/mm/slice: Enhance for supporting PPC32 > Applying: powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx > [root@localhost linux-stable]# > > > > > Can you fix this series up and resend the whole thing? > > Is there any conflicting patch in the queue ? > What should I rebase on ? Ah, the problem is I was taking the upstream version of this patch, not your backported one. Next time be a bit more specific and say you changed something here, otherwise I will always default to what is in Linus's tree. Let me go work on this again... thanks, greg k-h