Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Johan Hovold <johan@kernel.org>
Cc: johan+linaro@kernel.org, hsinyi@chromium.org,
	mark-pk.tsai@mediatek.com, maz@kernel.org,
	stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] irqdomain: Look for existing mapping only once" failed to apply to 5.15-stable tree
Date: Mon, 13 Mar 2023 12:25:05 +0100	[thread overview]
Message-ID: <ZA8IEdjBoHXi/sQY@kroah.com> (raw)
In-Reply-To: <ZA8GliA5EyxBGSif@hovoldconsulting.com>

On Mon, Mar 13, 2023 at 12:18:46PM +0100, Johan Hovold wrote:
> On Mon, Mar 06, 2023 at 07:47:59PM +0100, Greg Kroah-Hartman wrote:
> > 
> > The patch below does not apply to the 5.15-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-5.15.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '167812847919116@kroah.com' --subject-prefix 'PATCH 5.15.y' HEAD^..
> > 
> > Possible dependencies:
> > 
> > 6e6f75c9c98d ("irqdomain: Look for existing mapping only once")
> 
> Both the below commit and the dependency were ultimately included in
> 5.15.y, but the initial failure to add them appears to have prevented
> the subsequent fixes from being applied.
> 
> Specifically, 5.15.y is now missing
> 
> 	d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()")

THis commit does not apply to 5.15.y, even with:

> 	601363cc08da ("irqdomain: Fix mapping-creation race")

This one applied.

I've applied this one to 5.15.y only, it doesn't apply to 5.10.y or
older.

thanks,

greg k-h

  reply	other threads:[~2023-03-13 11:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-06 18:47 FAILED: patch "[PATCH] irqdomain: Look for existing mapping only once" failed to apply to 5.15-stable tree gregkh
2023-03-13 11:18 ` Johan Hovold
2023-03-13 11:25   ` Greg KH [this message]
2023-03-13 11:41     ` Johan Hovold
2023-03-13 12:15     ` 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=ZA8IEdjBoHXi/sQY@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=hsinyi@chromium.org \
    --cc=johan+linaro@kernel.org \
    --cc=johan@kernel.org \
    --cc=mark-pk.tsai@mediatek.com \
    --cc=maz@kernel.org \
    --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