From patchwork Thu Jun 22 00:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13288096 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 09FA6EB64D7 for ; Thu, 22 Jun 2023 00:27:07 +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=1gsODjVboy50vSLSb/GxxwaObgOpMnqi9p4cSCzrENg=; b=kV1 Tnaxsr23DxqgbglyF0+uJ81CgMxbNWHG8Z54d5Up7QXKOfXFLAzz4bOetNzmj7TBze1DWj9/QOMHV rohzjNRAxEQSDRzeAHSQpnpeN0K8tjfmgPBmJ6gh5NR+Bv6sAomMzopTs4ePp6HAz7WuBmo1eUMtd jFpkoDFQ2Cr0oMENozc7A/gvCEUVBHlBxZRGVeBtR0/KjyvN7DnaF9YTnruVK5XWTae00AHjjruHl U7+Q+SoBcPZ2EVWmvPWeWdnomyiJewnVImfJDhsdgcF763OISZX749zNY6Fwm/yZemopoc/TwdJVP p8/bur0qHLvXSPKL7Hu+ME5PbFvzm8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qC89x-00G9EB-0v; Thu, 22 Jun 2023 00:26:49 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qC89t-00G9CN-1q for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 00:26:47 +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 4Qmh4m6KjLz4wjC; Thu, 22 Jun 2023 10:26:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687393593; bh=19SFAqyiGHIjSeaYz7gu4pZOvtfALbexMUSRYuNdHw4=; h=Date:From:To:Cc:Subject:From; b=K2NPfU0uhfr4a623V49I9xDEFiNVzXEBZtWb2yE4khz5sixZ1qjbpqCfu6mCmGG6k Ovt7SbKc2rFxzqCeZ1Wa/a0zPIleyHzpDRydr0pxbat3bOON2mx8If449AhECiVwVW YhLBlSnhxFLTMtdrGlzzJPOcaTC9o0pGSvUNaQGxuw9esqGuwZNihZRs0WDVMFlK7K +pRts073PhQfLZVCs+T5AcBMQLxNbvV7rTgzGCEGR3TGRoALOERJKf739flpYmVvEo g9BPMtAEisCrjRbaLYUt4wA9jyfbs3BzNJ7zH7q5J72TRa5Idox/6YPsWV61oZYLUP Cgu1DztPm7NFA== Date: Thu, 22 Jun 2023 10:26:30 +1000 From: Stephen Rothwell To: Kevin Hilman , Neil Armstrong , Olof Johansson , Arnd Bergmann Cc: ARM , Heiner Kallweit , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring Subject: linux-next: manual merge of the amlogic tree with the arm-soc tree Message-ID: <20230622102630.263ae2b8@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230621_172645_898833_E51EDBA5 X-CRM114-Status: GOOD ( 15.17 ) 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 amlogic tree got a conflict in: MAINTAINERS between commit: 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") from the arm-soc tree and commit: 9e70e49474bb ("MAINTAINERS: add PHY-related files to Amlogic SoC file list") from the amlogic 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 7ad2bf6ac1af,9f769aa65936..000000000000 --- a/MAINTAINERS