From nobody Thu Jun 25 10:44:36 2026 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 8B959C433FE for ; Mon, 21 Feb 2022 22:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235642AbiBUWcs (ORCPT ); Mon, 21 Feb 2022 17:32:48 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:57992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235607AbiBUWcr (ORCPT ); Mon, 21 Feb 2022 17:32:47 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24DAA26CC; Mon, 21 Feb 2022 14:32:22 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id 3CE94CE12AF; Mon, 21 Feb 2022 22:32:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94B8BC340E9; Mon, 21 Feb 2022 22:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645482739; bh=oNd55KzMQeaSAd6DDSrw5QGVIEvLaDaOWF9kCKeKBfk=; h=From:To:Cc:Subject:Date:From; b=Kxbv5uLE79vPeHEeQnCY35iiRvSP+ObqzIC34W8mSBerCaUuYJo8wznyOZC9aQ8F/ yc9t82oeg1FromwlQUdmz1a1nIS0ls9kq4ikShVk78fQ0brgP7z2Wo1EA74zdwLkb/ FeNsQ+clzyW+TGSYY3Kj4k+SOZ6P3WvfiLriEuvYJfhT4da1RgWxP9r+AYhDyz1Xxm c/NFTQLLOzzFdaK0Ht/SPwUexS3noTc3O1BrXOt+I6OMkqREGHXk/K75Oz1EZ64ku7 HBZwlA+CeXaQEyQ8+MX+Fq2nsnsi+UuZKAiUgKfyvnOQgM/vzNBCMFwW/Bez8qROMq dhfRVlXmBhWjg== From: broonie@kernel.org To: Linus Walleij Cc: Linux Kernel Mailing List , Linux Next Mailing List , Marc Zyngier Subject: linux-next: manual merge of the pinctrl tree with the irqchip tree Date: Mon, 21 Feb 2022 22:32:16 +0000 Message-Id: <20220221223216.3616980-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the pinctrl tree got a conflict in: drivers/pinctrl/pinctrl-starfive.c between commit: 0d872ed9e2148 ("pinctrl: starfive: Move PM device over to irq domain") from the irqchip tree and commit: 64fd52a4d3ce6 ("pinctrl: starfive: Use a static name for the GPIO irq_chi= p") from the pinctrl tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/pinctrl/pinctrl-starfive.c index 5be9866c2b3c0,0e4ff4c709f87..0000000000000 --- a/drivers/pinctrl/pinctrl-starfive.c +++ b/drivers/pinctrl/pinctrl-starfive.c @@@ -1307,8 -1308,8 +1308,6 @@@ static int starfive_probe(struct platfo sfp->gc.base =3D -1; sfp->gc.ngpio =3D NR_GPIOS; =20 - starfive_irq_chip.name =3D sfp->gc.label; - starfive_irq_chip.parent_device =3D dev; -- sfp->gc.irq.chip =3D &starfive_irq_chip; sfp->gc.irq.parent_handler =3D starfive_gpio_irq_handler; sfp->gc.irq.num_parents =3D 1;