On Mon, Mar 13, 2023 at 12:25:05PM +0100, Greg Kroah-Hartman wrote: > 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@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()") > > 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. They need to be applied in order. Let me post backports then. Cherry picking them worked just fine, but I did not try git am which may be more picky. Johan
