From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB3A0C61DA4 for ; Mon, 13 Mar 2023 11:25:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229757AbjCMLZK (ORCPT ); Mon, 13 Mar 2023 07:25:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbjCMLZJ (ORCPT ); Mon, 13 Mar 2023 07:25:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73588591F7 for ; Mon, 13 Mar 2023 04:25:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0DE3060C78 for ; Mon, 13 Mar 2023 11:25:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29660C433D2; Mon, 13 Mar 2023 11:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678706707; bh=6jj5q9ie5sNWkdwOYbJSDZlMX9LwDyyroi5IfpTqZmY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kDa5u4V3OOxpUWOolBpZUwwdjYln0FV43iMjUHH3zftqilmWk5Em0cX0VCy82mnQn OW1db96cZIc5/dTRkBuNuN3EuXZxn/c9eSo9wGNTNpBs/xw/7Ro7qn2siL5OIAOw9j 1LDhoPxTY0rdmu7coqo0n80VzwGGmiyTXQLrAEII= Date: Mon, 13 Mar 2023 12:25:05 +0100 From: Greg KH To: Johan Hovold 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 Message-ID: References: <167812847919116@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . > > > > 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 > > # > > git commit -s > > git send-email --to '' --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