From patchwork Fri Nov 18 05:06:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13047725 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 AA4C3C4332F for ; Fri, 18 Nov 2022 05:08:33 +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=nBE9jA61xX1WUXUeNAWcfn6fISzYkqC3012/blL+F3E=; b=ILl 0MMLJ+DIwGPvNar1qI/YLw6U/SWj542/fUqaNz56c4ou6DCJpKV7nvlvW2PSFCGYCoONqRE3Jpvpn DPHH1QAw6WOf8a8NYnrOFNWPPmUb99PeXyKa9oHP7bXCjDOX8dWJCPiEtc00BoTrdEaLrpIXW2CTt jvDpGattM5oCfQFyOYgIaPtENWu5E9RtG3MjXx/00sdixHMXdsJJAgtofrxrWeL0e7bCyO2ry4bjN Glolsey8Yahr6voNa73NGeXIYbmxSSrIWSci4ZPU9liVIaHlxChyjLqK9aT1TIDX3/46uAYWK6bxf JphFslv24k7AVaZ5OeKJ8uB5VmqKrTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovtaS-001t2v-Jm; Fri, 18 Nov 2022 05:06:48 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ovtaO-001sx3-Pw for linux-arm-kernel@lists.infradead.org; Fri, 18 Nov 2022 05:06:46 +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 4ND4WH5HKwz4xTg; Fri, 18 Nov 2022 16:06:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668747981; bh=T1MFAIfpM2C/YonaaB7UpbcsoXJOdQH4wk0zCh0yK3s=; h=Date:From:To:Cc:Subject:From; b=ESBCarbnttmvS1fXfLvUzOUB/XoNkZ1IYEt6eGYSu4A/rxvge2jLs/sE/1MIjX2zc OAHaHsD04OVtRVSaWT6pZQ9Ja4xsJli3lW4CgwsYfJx351+EvwTquRGhI+mo7Z0RMN NzSE1RLSbYr/SQVyGM7xB/uPIXImE+gFAxY581k6ff5c77K79lo5vG7KLYkrL+rdFW mAdUDrJUUysNpRAzvR8fEyhSV361Y1e5CmYEFrT2dg3havo4ma9XiFF7RhWveE5axo nRB1u1u7VTOlFKVxpDHNYCSMsuADzgJKWTYa1vJSpd5BwzgwbflEB2nuqHbM1SiVlG gkPhTtGD3sDNw== Date: Fri, 18 Nov 2022 16:06:17 +1100 From: Stephen Rothwell To: Linus Walleij , Olof Johansson , Arnd Bergmann Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List , Yinbo Zhu Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Message-ID: <20221118160617.5955f2ff@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221117_210645_116476_ECC8A036 X-CRM114-Status: GOOD ( 16.25 ) 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: MAINTAINERS between commit: b82621ac8450 ("soc: loongson: add GUTS driver for loongson-2 platforms") from the arm-soc tree and commit: 457ff9fb29d7 ("dt-bindings: pinctrl: add loongson-2 pinctrl") 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 MAINTAINERS index ec383d27e762,f76107c24949..000000000000 --- a/MAINTAINERS