From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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
Date: Sat, 2 Jun 2018 22:55:31 +0200 [thread overview]
Message-ID: <f18dc860-6007-9955-8c73-25faf43097e8@c-s.fr> (raw)
In-Reply-To: <20180602132107.GH31493@kroah.com>
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@c-s.fr>
>> Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
>> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
>> ---
>> 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
next prev parent reply other threads:[~2018-06-03 8:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-31 8:54 [PATCH 4.14 1/4] powerpc/mm/slice: Remove intermediate bitmap copy Christophe Leroy
2018-05-31 8:54 ` [PATCH 4.14 2/4] powerpc/mm/slice: create header files dedicated to slices Christophe Leroy
2018-06-02 13:21 ` Greg Kroah-Hartman
2018-06-02 20:55 ` Christophe Leroy [this message]
2018-06-03 9:21 ` Greg Kroah-Hartman
2018-06-03 9:23 ` Greg Kroah-Hartman
2018-05-31 8:54 ` [PATCH 4.14 3/4] powerpc/mm/slice: Enhance for supporting PPC32 Christophe Leroy
2018-05-31 8:54 ` [PATCH 4.14 4/4] powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx Christophe Leroy
-- strict thread matches above, loose matches on Subject: below --
2018-03-09 15:48 [PATCH 4.14 1/4] powerpc/mm/slice: Remove intermediate bitmap copy Christophe Leroy
2018-03-09 15:49 ` [PATCH 4.14 2/4] powerpc/mm/slice: create header files dedicated to slices Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f18dc860-6007-9955-8c73-25faf43097e8@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).