From patchwork Tue Dec 6 01:13:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13065269 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74637C4708C for ; Tue, 6 Dec 2022 01:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=cios92Zgkq+xgft8VQlDJqny+uuDjmGG5ga3IkkM0G8=; b=ftG nWI8tdK0RtuUTLWp1gZCyJyy8ATHlvxz3oCVt1vWKmsnwV+6q3/SQ8ps6k8vmSWT1Ln5ehTQmm8ki 6bsh9F0wjwAsePTbQ+FVV+44vwH7WPPRZlA3yztho0SVpmSyFzk7cxzfxXgy54TQ3a8BoEuIfNGff dHwapzbW/QELkCM5e2HoMFuKBpocoAnSXwjHTsJn+eHkWTtY9xJ7hkH3NiGLTolTfAF8NFb7yJN2i n4aOKPMSuS32TsvB+zaaCvsiTzCvs5REz/LFr9u/WoOJVb2x68pCzn9pEpooewjvP1ATv888vQ0ac /N21fSpQJCGnpx2czTYeaTDoguTIXDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2MX9-00EkRS-F4; Tue, 06 Dec 2022 01:14:07 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2MX5-00EkLL-Rl for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2022 01:14:05 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NR2VV0gmnz4xG6; Tue, 6 Dec 2022 12:13:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1670289219; bh=XZaVH3uav8QW5c1zAbnSpShdGDyJPaS5c3+u/jlf+zw=; h=Date:From:To:Cc:Subject:From; b=CWcGf68Om5ueioQ7Ijp1+P0OaWg+hDkusBofES08YSKgwjpHcXoCRYozNfeXNAOtk inGI+SaV9xch2gm909qWGfhQQHUu+lhrrJw1tPGQJ4+54XT59HJgBv0znbSoX5XXtV U2SldrGIgeidAtG/K2q3G+wAW/uPTWIKpS1qfRNDbAwqq4a4aY3xGR65JoCdfVsqIR VNT5lDWDakaXs5LzGmItR8+iwPyLnHyohTPnc0csRaBti+75Km3Dz2vJ4Sd/KgZYfA l0LBZuj9oapQcLJX1KjhwhH3lxlx8Mjt+5nTbylIa4U3tRZlCKLPzS5G9RKVAU0KfI kcl1cxD1cfeVw== Date: Tue, 6 Dec 2022 12:13:36 +1100 From: Stephen Rothwell To: Linus Walleij , Olof Johansson , Arnd Bergmann Cc: ARM , Andy Shevchenko , Dmitry Torokhov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Message-ID: <20221206121336.474457bb@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221205_171404_247634_51F7A785 X-CRM114-Status: GOOD ( 19.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the pinctrl tree got a conflict in: drivers/soc/fsl/qe/gpio.c between commits: 84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()") 66310b5a0fc1 ("soc: fsl: qe: request pins non-exclusively") from the arm-soc tree and commit: c9eb6e546a23 ("soc: fsl: qe: Switch to use fwnode instead of of_node") 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/soc/fsl/qe/gpio.c index 1440922341d8,9abb45ab138b..000000000000 --- a/drivers/soc/fsl/qe/gpio.c