From: David Hildenbrand <david@redhat.com>
To: gregkh@linuxfoundation.org, akpm@linux-foundation.org,
lstoakes@gmail.com, miklos@szeredi.hu, mszeredi@redhat.com,
rppt@kernel.org, samsun1006219@gmail.com, stable@vger.kernel.org,
xrivendell7@gmail.com
Subject: Re: FAILED: patch "[PATCH] mm/secretmem: fix GUP-fast succeeding on secretmem folios" failed to apply to 6.1-stable tree
Date: Mon, 8 Apr 2024 12:42:30 +0200 [thread overview]
Message-ID: <3524e6f2-ad50-47b5-85d4-107bd9821352@redhat.com> (raw)
In-Reply-To: <2024040819-elf-bamboo-00f6@gregkh>
On 08.04.24 12:14, 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 65291dcfcf8936e1b23cfd7718fdfde7cfaf7706
> # <resolve conflicts, build, test, etc.>
> git commit -s
Likely we want:
git cherry-pick -sx
And then
(a) If cherry-picking failed
# <resolve conflicts, build, test, etc.>
git cherry-pick --continue
(b) If cherry-picking succeeded
# <resolve issues, build, test, etc.>
git commit --amend
--
Cheers,
David / dhildenb
prev parent reply other threads:[~2024-04-08 10:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 10:14 FAILED: patch "[PATCH] mm/secretmem: fix GUP-fast succeeding on secretmem folios" failed to apply to 6.1-stable tree gregkh
2024-04-08 10:34 ` [PATCH 6.1.y] mm/secretmem: fix GUP-fast succeeding on secretmem folios David Hildenbrand
2024-04-08 10:39 ` David Hildenbrand
2024-04-08 11:27 ` Greg KH
2024-04-08 10:42 ` David Hildenbrand [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=3524e6f2-ad50-47b5-85d4-107bd9821352@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=lstoakes@gmail.com \
--cc=miklos@szeredi.hu \
--cc=mszeredi@redhat.com \
--cc=rppt@kernel.org \
--cc=samsun1006219@gmail.com \
--cc=stable@vger.kernel.org \
--cc=xrivendell7@gmail.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