From: Greg KH <gregkh@linuxfoundation.org>
To: Hugh Dickins <hughd@google.com>
Cc: akpm@linux-foundation.org, baohua@kernel.org,
baolin.wang@linux.alibaba.com, chrisl@kernel.org,
david@redhat.com, hannes@cmpxchg.org,
kirill.shutemov@linux.intel.com, nphamcs@gmail.com,
richard.weiyang@gmail.com, ryan.roberts@arm.com,
shakeel.butt@linux.dev, shy828301@gmail.com,
stable@vger.kernel.org, usamaarif642@gmail.com,
wangkefeng.wang@huawei.com, willy@infradead.org, ziy@nvidia.com
Subject: Re: FAILED: patch "[PATCH] mm/thp: fix deferred split unqueue naming and locking" failed to apply to 6.6-stable tree
Date: Fri, 15 Nov 2024 06:33:31 +0100 [thread overview]
Message-ID: <2024111547-pod-carrot-54fc@gregkh> (raw)
In-Reply-To: <bcd65dea-5dfe-7d55-68bb-4a7031ebaccf@google.com>
On Wed, Nov 13, 2024 at 12:59:53AM -0800, Hugh Dickins wrote:
> On Mon, 11 Nov 2024, gregkh@linuxfoundation.org wrote:
> >
> > The patch below does not apply to the 6.6-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.6.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x f8f931bba0f92052cf842b7e30917b1afcc77d5a
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024111106-employer-bulgur-4f6d@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
>
> Thanks for trying this: as expected, the v6.11 port was easy,
> but earlier releases not.
>
> I've probably spent more effort on this v6.6 version than it deserves,
> and folks may not even like the result: though I am fairly satisfied
> with it by now, and testing has shown no problems.
>
> If I do go on to do v6.1 and earlier (not immediately), I won't approach
> them in this way, but just do minimal patches to fix mem_cgroup_move_charge
> and mem_cgroup_swapout (mem_cgroup_migrate was safe until v6.7).
>
> There's a tarball attached, containing the series of six backports needed
> (three clean, three differing slightly from the originals). But let me
> put inline below a squash of those six, so it's easier for all on Cc to
> see what it amounts to without extracting the tarball. Based on v6.6.60,
> no conflict with v6.6.61-rc1
Thanks for this! I accidentally commited this one "big patch" to the
queue, but then realized the tarball was what I wanted, so went back and
applied from there directly. Sorry for any confusing emails sent out
about that.
greg k-h
prev parent reply other threads:[~2024-11-15 5:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 11:36 FAILED: patch "[PATCH] mm/thp: fix deferred split unqueue naming and locking" failed to apply to 6.6-stable tree gregkh
2024-11-13 8:59 ` Hugh Dickins
2024-11-15 5:33 ` Greg KH [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=2024111547-pod-carrot-54fc@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=chrisl@kernel.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=nphamcs@gmail.com \
--cc=richard.weiyang@gmail.com \
--cc=ryan.roberts@arm.com \
--cc=shakeel.butt@linux.dev \
--cc=shy828301@gmail.com \
--cc=stable@vger.kernel.org \
--cc=usamaarif642@gmail.com \
--cc=wangkefeng.wang@huawei.com \
--cc=willy@infradead.org \
--cc=ziy@nvidia.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