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: 111374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4739336vqr; Wed, 21 Jun 2023 17:38:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4iUhU4WntCEPHPs/U0SwBQXxTZtxOn7RzLNq9irSIgXit6JBKAkPQaJWee+y15SK8AqOVD X-Received: by 2002:a05:622a:18a:b0:3fd:e410:73a6 with SMTP id s10-20020a05622a018a00b003fde41073a6mr16102156qtw.7.1687394338552; Wed, 21 Jun 2023 17:38:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687394338; cv=none; d=google.com; s=arc-20160816; b=dDhky6xFiH5ntqGut3cpiIhldrHMZcGCH8fn9pVVlVQXhCtKXjv7KVsBuyaaJhyjYq uee3OghINTkM8Fbf68C2OCnpo8BrvsFiWl0PklrZD6UicJCbSmNRvnCLpNP8k5w5Pw1I zypXKLvGD1JaIpgrAMQ0neJ14khH1V3E0nyuwLXqbEOogbyMzeHj39Q4ndqpQWb7ZjPV ynFgt1kV+nRepcfdpxsb/wNBuJJypQJQ9d7Yybc/437LlM4jX11SBxCTqUf23eQ7KkDz ijqN40A3AllP5npCjbXO4rFzeFYSEDAOtzvTkcyg5YbfnqpnZENv/r5Q36+Zpgkac0eL QJtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=19SFAqyiGHIjSeaYz7gu4pZOvtfALbexMUSRYuNdHw4=; b=vu2wRKPiA+EQVrMOI0Hw340tVFBXQ2GLi0pBC0sDA82DJ+p8iDIP21QVCCisFF0b2C oaK0V8c1xSGgdFN2cbLE4yT67pqzWcY8C4AP64ojBRZ/IFxJYn5cZKzDMAsIe8CcZwNn 7t1pf/PzMEpKYemiMsmus7kZKzqO3DYPbXp1TR9NhL8D8+ZVi+qDmQvw1mdJ+64AMIlC eBaWv17OBZlgqYr1H+UpZBp4Ac/Dgtvl/TLAwTkGfRCoUUvYIFh7POWLpB18vRkBuqQl 4SYS26OMFvxvgy8JrILTHZLMDGzmKp6qe941tCLl3HeBFITWkV35CXOmQYhonPDAM8lH zUdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=K2NPfU0u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s8-20020a17090aba0800b00260d9e72b9asi3892107pjr.124.2023.06.21.17.38.46; Wed, 21 Jun 2023 17:38:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=K2NPfU0u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229530AbjFVA0q (ORCPT + 99 others); Wed, 21 Jun 2023 20:26:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjFVA0o (ORCPT ); Wed, 21 Jun 2023 20:26:44 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F7E2A1; Wed, 21 Jun 2023 17:26:40 -0700 (PDT) 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-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769361206102935205?= X-GMAIL-MSGID: =?utf-8?q?1769361206102935205?= 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