From: Greg KH <gregkh@linuxfoundation.org>
To: Kalesh Singh <kaleshsingh@google.com>
Cc: akpm@linux-foundation.org, aneesh.kumar@linux.ibm.com,
angelogioacchino.delregno@collabora.com, baohua@kernel.org,
bgeffon@google.com, heftig@archlinux.org,
lecopzer.chen@mediatek.com, matthias.bgg@gmail.com,
oleksandr@natalenko.name, quic_charante@quicinc.com,
steven@liquorix.net, suleiman@google.com, surenb@google.com,
yuzhao@google.com, zhengqi.arch@bytedance.com,
stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] Multi-gen LRU: fix per-zone reclaim" failed to apply to 6.1-stable tree
Date: Wed, 13 Sep 2023 10:11:51 +0200 [thread overview]
Message-ID: <2023091342-treason-jam-8a17@gregkh> (raw)
In-Reply-To: <CAC_TJvfS3TWr4NtzU+STAeQQio3PcK=r5sp_NbsW2jEffhHUGQ@mail.gmail.com>
On Mon, Sep 11, 2023 at 10:58:54AM -0700, Kalesh Singh wrote:
> On Sat, Sep 9, 2023 at 6:04 AM <gregkh@linuxfoundation.org> wrote:
> >
> >
> > The patch below does not apply to the 6.1-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>.
> >
> > To reproduce the conflict and resubmit, you may use the following commands:
> >
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 669281ee7ef731fb5204df9d948669bf32a5e68d
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023090959-mothproof-scarf-6195@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> >
> > Possible dependencies:
> >
> > 669281ee7ef7 ("Multi-gen LRU: fix per-zone reclaim")
> > 6df1b2212950 ("mm: multi-gen LRU: rename lrugen->lists[] to lrugen->folios[]")
>
> Hi Greg,
>
> Can you apply in this order please:
>
> 1) 6df1b2212950 ("mm: multi-gen LRU: rename lrugen->lists[] to
> lrugen->folios[]")
> 2) 669281ee7ef7 ("Multi-gen LRU: fix per-zone reclaim")
>
> With the one rename dependency, I've checked that this applies cleanly
> and tested it.
> Or let me know if you prefer I resend both.
That worked, now queued up, thanks!
greg k-h
next prev parent reply other threads:[~2023-09-13 8:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 13:04 FAILED: patch "[PATCH] Multi-gen LRU: fix per-zone reclaim" failed to apply to 6.1-stable tree gregkh
2023-09-11 17:58 ` Kalesh Singh
2023-09-13 8:11 ` Greg KH [this message]
2023-09-13 3:40 ` [PATCH 6.1.y] Multi-gen LRU: fix per-zone reclaim Kalesh Singh
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=2023091342-treason-jam-8a17@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=baohua@kernel.org \
--cc=bgeffon@google.com \
--cc=heftig@archlinux.org \
--cc=kaleshsingh@google.com \
--cc=lecopzer.chen@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=oleksandr@natalenko.name \
--cc=quic_charante@quicinc.com \
--cc=stable@vger.kernel.org \
--cc=steven@liquorix.net \
--cc=suleiman@google.com \
--cc=surenb@google.com \
--cc=yuzhao@google.com \
--cc=zhengqi.arch@bytedance.com \
/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