Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Michael Ellerman <mpe@ellerman.id.au>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        stable@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
        Yves-Alexis Perez <corsac@debian.org>,
        Nicholas Piggin <npiggin@gmail.com>
Subject: Re: [PATCH 4.9 34/77] powerpc: fix build errors in stable tree
In-Reply-To: <20180221124433.618725458@linuxfoundation.org>
References: <20180221124432.172390020@linuxfoundation.org> <20180221124433.618725458@linuxfoundation.org>
Date:   Thu, 22 Feb 2018 12:01:21 +1100
Message-ID: <87k1v5rg66.fsf@concordia.ellerman.id.au>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:

> 4.9-stable review patch.  If anyone has any objections, please let me know.
>
> ------------------
>
> From: Nicholas Piggin <npiggin@gmail.com>
>
> This is just the first chunk of commit
> 222f20f140623ef6033491d0103ee0875fe87d35 upstream.

That should have been back ported in full?

Oh I see now Greg took my 4.4 series and applied it to 4.9 but this one
didn't apply.

So I guess this patch is OK for now, but we do need a full back port of
222f20f to 4.9.

cheers


> to fix a build error in the powerpc tree due to other backports
> happening (and this full patch not being backported).
>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Reported-by: Yves-Alexis Perez <corsac@debian.org>
> Cc: Nicholas Piggin <npiggin@gmail.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Yves-Alexis Perez <corsac@debian.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>  arch/powerpc/kernel/entry_64.S |    5 +++++
>  1 file changed, 5 insertions(+)
>
> --- a/arch/powerpc/kernel/entry_64.S
> +++ b/arch/powerpc/kernel/entry_64.S
> @@ -39,6 +39,11 @@
>  #include <asm/tm.h>
>  #include <asm/ppc-opcode.h>
>  #include <asm/export.h>
> +#ifdef CONFIG_PPC_BOOK3S
> +#include <asm/exception-64s.h>
> +#else
> +#include <asm/exception-64e.h>
> +#endif
>  
>  /*
>   * System calls.