From patchwork Fri Dec 17 06:29:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12696583 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 30D19C433EF for ; Fri, 17 Dec 2021 06:31:18 +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=p2b6BWmVAchI58ix+FkyPG5Sq2HMUylAjTgQMHVeRu4=; b=qv4 YstZmwtH2MBG+V2ByH4e3Lf+9EEwIzajKHjq5DX26zfkSVlQewFPd5LiD9tuY7rjmH4TjQBMmnrbN 2z5np5jjbtWz4hRg0/wfBknS7cRiignUWznKA6ROFAaL7IvervVpy7gDlYzA1YAIjr98SP7WmY93e RehS8ELxA+62FIus1sLbdRU+jf2fMpNc4n979y6djYIm+nb5KTmoO8WyoYA851hYaOwGcHcvJs+xe qVCQ0MifBnF4wzZWer2v8cMKWrsGy5XjE6NskKRL80zKx9+RhvXVdwQXuknx4GO67mFlr8fIFrv2q IT6/BxG+2wIVH5pWA/KuGXsoEXojBpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1my6kU-008jXi-QC; Fri, 17 Dec 2021 06:29:46 +0000 Received: from gandalf.ozlabs.org ([2404:9400:2:0:216:3eff:fee2:21ea]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1my6kR-008jWn-8y for linux-arm-kernel@lists.infradead.org; Fri, 17 Dec 2021 06:29:44 +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 4JFfGN2Hg3z4xd4; Fri, 17 Dec 2021 17:29:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1639722579; bh=PyKtBzR8c50cKGocDdxfifUNGLAEUQhPnkXBDZyrg4w=; h=Date:From:To:Cc:Subject:From; b=bp5xB5rmc0ORNIz0UvkioJquiNJ5eOxSiEg896tMt5iWPiNXyzIRNJr7/ybSV0k6k uWEAJZMABdPPCnDeoBd7RYHvNmuJZ4t5ogcSz7w21AAcAzxkUEzQFGJDGAmJi0tpb0 RcATTrCOtWOYN1aN/6bcJckk5TSJZqjT0X2IdEOgerdObeIkT9x/KjzVbeTwhu2DvA 6CrUdSE2kaCcauEbYUhvxY/jdk54SHuh9mu0H6B0fsUgYfSxwP84b+6osxt9fBOtUk uIxN5BsIwOfOxZhPEu5Idm3R3bc8W/xhvtpycxZsoVXtDiLqYbxCTky28TqPS1yqKr CbPk3DXTxs8sg== Date: Fri, 17 Dec 2021 17:29:31 +1100 From: Stephen Rothwell To: Linus Walleij , Olof Johansson , Arnd Bergmann , ARM Cc: Andy Shevchenko , Drew Fustini , Emil Renner Berthing , Huan Feng , Kiran Kumar S , Lakshmi Sowjanya D , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Message-ID: <20211217172931.01c24d4b@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_222943_500071_0C7A34B1 X-CRM114-Status: GOOD ( 15.11 ) 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 conflicts in: drivers/pinctrl/Kconfig drivers/pinctrl/Makefile between commit: ec648f6b7686 ("pinctrl: starfive: Add pinctrl driver for StarFive SoCs") from the arm-soc tree and commits: 12422af8194d ("pinctrl: Add Intel Thunder Bay pinctrl driver") b124c8bd50c7 ("pinctrl: Sort Kconfig and Makefile entries alphabetically") 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/Kconfig index 0d5b61e4c21e,c27c9ee89f0e..000000000000 --- a/drivers/pinctrl/Kconfig