On Mon, Mar 13, 2023 at 12:23:42PM +0100, Greg Kroah-Hartman wrote: > On Mon, Mar 13, 2023 at 12:19:59PM +0100, Johan Hovold wrote: > > On Mon, Mar 06, 2023 at 07:48:35PM +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@xxxxxxxxxxxxxxx>. > > > > > > 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 d55f7f4c58c07beb5050a834bf57ae2ede599c7e > > > # <resolve conflicts, build, test, etc.> > > > git commit -s > > > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '1678128515101149@xxxxxxxxx' --subject-prefix 'PATCH 5.15.y' HEAD^.. > > > > > > Possible dependencies: > > > > > > d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()") > > > > The below commit applies fine to 5.15.y. Could you try cherry-picking it > > again? > > patching file kernel/irq/irqdomain.c > Hunk #1 succeeded at 1464 (offset 23 lines). > Hunk #2 succeeded at 1488 (offset 23 lines). > Hunk #3 FAILED at 1486. > 1 out of 3 hunks FAILED -- rejects in file kernel/irq/irqdomain.c > > And doesn't look to apply properly as the EXPORT_SYMBOL_GPL(... line is > not in 5.15.y Ok, I only tried cherry picking which worked fine. I've posted a backport of this one and the follow-on fix now. They should be applied in order to avoid a build failure so you should drop the second patch which you already applied ("irqdomain: Fix mapping-creation race") in favour of that series. Johan
