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? Johan > ------------------ original commit in Linus's tree ------------------ > > From d55f7f4c58c07beb5050a834bf57ae2ede599c7e Mon Sep 17 00:00:00 2001 > From: Johan Hovold <johan+linaro@xxxxxxxxxx> > Date: Mon, 13 Feb 2023 11:42:47 +0100 > Subject: [PATCH] irqdomain: Refactor __irq_domain_alloc_irqs() > > Refactor __irq_domain_alloc_irqs() so that it can be called internally > while holding the irq_domain_mutex. > > This will be used to fix a shared-interrupt mapping race, hence the > Fixes tag. > > Fixes: b62b2cf5759b ("irqdomain: Fix handling of type settings for existing mappings") > Cc: stable@xxxxxxxxxxxxxxx # 4.8 > Tested-by: Hsin-Yi Wang <hsinyi@xxxxxxxxxxxx> > Tested-by: Mark-PK Tsai <mark-pk.tsai@xxxxxxxxxxxx> > Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx> > Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20230213104302.17307-6-johan+linaro@xxxxxxxxxx
