From: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com>
To: "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"Hansen, Dave" <dave.hansen@intel.com>,
"tglx@kernel.org" <tglx@kernel.org>
Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] x86/shstk: Prevent deadlock during shstk sigreturn" failed to apply to 6.6-stable tree
Date: Mon, 4 May 2026 21:38:16 +0000 [thread overview]
Message-ID: <42948c0bf8e894a77378c25082e6eb38505c58eb.camel@intel.com> (raw)
In-Reply-To: <2026050437-throat-unrivaled-2769@gregkh>
On Mon, 2026-05-04 at 10:42 +0200, 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 9874b2917b9fbc30956fee209d3c4aa47201c64e
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026050437-throat-unrivaled-2769@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
>
> Possible dependencies:
This didn't apply because of the other related fix "x86: shadow stacks: proper
error handling for mmap lock" was missing from those stable trees. But it also
doesn't work because the vma refcount infrastructure the patch uses is missing.
I just sent out backports for the other fix, but I'm still working on what to do
about this one.
prev parent reply other threads:[~2026-05-04 21:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 8:42 FAILED: patch "[PATCH] x86/shstk: Prevent deadlock during shstk sigreturn" failed to apply to 6.6-stable tree gregkh
2026-05-04 21:38 ` Edgecombe, Rick P [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=42948c0bf8e894a77378c25082e6eb38505c58eb.camel@intel.com \
--to=rick.p.edgecombe@intel.com \
--cc=dave.hansen@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=tglx@kernel.org \
--cc=torvalds@linux-foundation.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