From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.linuxfoundation.org ([140.211.169.12]:45052 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728020AbeIQPBK (ORCPT
        <rfc822;stable@vger.kernel.org>); Mon, 17 Sep 2018 11:01:10 -0400
Date: Mon, 17 Sep 2018 11:34:31 +0200
From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>,
        Vineet Gupta <Vineet.Gupta1@synopsys.com>
Subject: Re: FAILED: patch "[PATCH] ARC: [plat-axs*]: Enable SWAP" failed to
 apply to 4.18-stable tree
Message-ID: <20180917093431.GC26181@kroah.com>
References: <153710120063208@kroah.com>
 <4993d6326e6d517d082a7e7ec53b9bcb990042c6.camel@synopsys.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4993d6326e6d517d082a7e7ec53b9bcb990042c6.camel@synopsys.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Sun, Sep 16, 2018 at 08:18:49PM +0000, Alexey Brodkin wrote:
> Hi Greg,
> 
> On Sun, 2018-09-16 at 14:33 +0200, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 4.18-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> 
> The reason for conflict is
> commit 4051c323c59b ("ARC: configs: cleanup") which removes the first
> line of defconfigs which is a part of this patch context.
> 
> Below is updated patch for pre 4.19 kernels (note it applies to 4.9, 4.14 and 4.18):
> -----------------------------------------------------

Thanks, now applied.

greg k-h