Re: [PATCH 4.14 2/4] powerpc/mm/slice: create header files dedicated to slices

[Christophe Leroy]

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 <christophe.leroy@xxxxxx>
> > Reviewed-by: Nicholas Piggin <npiggin@xxxxxxxxx>
> > Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> > ---
> >   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 ?

Thanks,
Christophe

> thanks,
>
> greg k-h

---
L'absence de virus dans ce courrier Ãlectronique a Ãtà vÃrifiÃe par le logiciel antivirus Avast.
https://www.avast.com/antivirus