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
Date: Mon, 17 Sep 2018 11:34:31 +0200 [thread overview]
Message-ID: <20180917093431.GC26181@kroah.com> (raw)
In-Reply-To: <4993d6326e6d517d082a7e7ec53b9bcb990042c6.camel@synopsys.com>
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
prev parent reply other threads:[~2018-09-17 15:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-16 12:33 FAILED: patch "[PATCH] ARC: [plat-axs*]: Enable SWAP" failed to apply to 4.18-stable tree gregkh
2018-09-16 20:18 ` Alexey Brodkin
2018-09-17 9:34 ` gregkh [this message]
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=20180917093431.GC26181@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Alexey.Brodkin@synopsys.com \
--cc=Vineet.Gupta1@synopsys.com \
--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).