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@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 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '167812847919116@xxxxxxxxx' --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()") 601363cc08da ("irqdomain: Fix mapping-creation race") both which apply fine to the 5.15 stable tree. Johan > ------------------ original commit in Linus's tree ------------------ > > From 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba Mon Sep 17 00:00:00 2001 > From: Johan Hovold <johan+linaro@xxxxxxxxxx> > Date: Mon, 13 Feb 2023 11:42:46 +0100 > Subject: [PATCH] irqdomain: Look for existing mapping only once > > Avoid looking for an existing mapping twice when creating a new mapping > using irq_create_fwspec_mapping() by factoring out the actual allocation > which is shared with irq_create_mapping_affinity(). > > The new helper function will also 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-5-johan+linaro@xxxxxxxxxx
