public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: akpm@linux-foundation.org, fleischermarius@gmail.com,
	sidhartha.kumar@oracle.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] maple_tree: fix mas_empty_area_rev() null pointer dereference" failed to apply to 6.1-stable tree
Date: Fri, 24 May 2024 06:09:52 +0200	[thread overview]
Message-ID: <2024052401-scrimmage-camera-8cfa@gregkh> (raw)
In-Reply-To: <tqyvr6nenpho7fg5p5byipkmlhrv7oqdw6qi3mzbq54nofeohf@4m4fe7xcxoyr>

On Thu, May 23, 2024 at 03:45:22PM -0400, Liam R. Howlett wrote:
> * gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> [240513 09:30]:
> > 
> > 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 955a923d2809803980ff574270f81510112be9cf
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024051347-uncross-jockstrap-5ce0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> > 
> > Possible dependencies:
> > 
> > 955a923d2809 ("maple_tree: fix mas_empty_area_rev() null pointer dereference")
> > 29ad6bb31348 ("maple_tree: fix allocation in mas_sparse_area()")
>    ^- This patch is needed, and has a fixes tag.  I'm not entirely sure
>    why it wasn't included in 6.1 already, but it applies cleanly and
>    fixes the issue with 955a923d2809.

"Fixes:" tags does not mean "will always end up in stable".  Please
read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

> > fad8e4291da5 ("maple_tree: make maple state reusable after mas_empty_area_rev()")

So you want us to take all of these?  Or just the one?

thanks,

greg k-h

  reply	other threads:[~2024-05-24  4:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13 13:29 FAILED: patch "[PATCH] maple_tree: fix mas_empty_area_rev() null pointer dereference" failed to apply to 6.1-stable tree gregkh
2024-05-23 19:45 ` Liam R. Howlett
2024-05-24  4:09   ` Greg KH [this message]
2024-05-24 13:03     ` Liam R. Howlett
2024-06-12 12:10       ` Greg KH

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=2024052401-scrimmage-camera-8cfa@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=Liam.Howlett@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=fleischermarius@gmail.com \
    --cc=sidhartha.kumar@oracle.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