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 :( Can you fix this series up and resend the whole thing? thanks, greg k-h
