From patchwork Wed Oct 11 23:14:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 151627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp871597vqb; Wed, 11 Oct 2023 16:15:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKa+EdHSoJtjsE9s+fpQS9KDeMzYPx8HM4lhVHT8s0bkyWgbLPIPJenT9zWNOek+LK67K1 X-Received: by 2002:a17:902:e5d2:b0:1c4:1cd3:8062 with SMTP id u18-20020a170902e5d200b001c41cd38062mr25471233plf.2.1697066138485; Wed, 11 Oct 2023 16:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697066138; cv=none; d=google.com; s=arc-20160816; b=OvWSGv53eTZnq82eN0swFWYAcmIPY6bDRAS1pNVRnKEb/CkOWCCjcJc61/I2x65lW1 dmL0bW7Mp2bSoK9UPKSn9wgik53mP0gs1UkVIHs0F87I+NkHOkM1jbq6wMY56pqZfxu5 fy5qfCYcAPtBbs2aBMTQYAUiv23iMxpoYPtoZ0O1+xpmJjD6D3GSpQ2KnLkSBUWhnM4g vEB3vtegimL5/58sbbZI4ifbCuFKzwn5TQ4K3q9nWNLvkEI9WqweG/ult/C/KFND1Jkw F/iNoFb/W17K/s1NNtHvr+luZ+dJ53N0q5Lgp2dHJARShh7iAoTt2PanUioT70NAQI/x jyTw== 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=Qf1p2gVy4rqI/LsmbKaNjjPoD1EJg71MiJ3nDq8hLn4=; fh=RVbPiqIPb8Ruj6g+CF7EeMzwzYhbaYkwiyPbE0qU53c=; b=tddFQIMPSkfeUeX07YaMeIRWSrISs/Aad/4mhoo0og1zPJxxciXpZIFnYigg93kZo5 5rJVJRYFT3jdD76x0hksz7SxL1Xs8pKOK7OVz0j2rL50YIfiNf0/e8sACqMsnFADm37u Dn0a8pLSY9IFeW0F/S/FZYJ/qzYLrtV0oNta/wIVESr/VZQR2SIyIOok+RrvYcAUdL8o FnM14AxePZIQLh3/J0Unls17iP1e1bc/WEoALnKhS3sRfyK/H9vW/pgapA942Q08IFbu iJFzuljwq15Az+lJ0qj1QoVoKRXepWX5ghwc6kCjvlDhqPu7FB0B1jrIhKH8fID9z8ul Gelg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=oN084AUl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id v4-20020a1709029a0400b001c61acd5be6si683624plp.209.2023.10.11.16.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 16:15:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=oN084AUl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 99C888043AF4; Wed, 11 Oct 2023 16:15:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233769AbjJKXPS (ORCPT + 18 others); Wed, 11 Oct 2023 19:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233834AbjJKXPQ (ORCPT ); Wed, 11 Oct 2023 19:15:16 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 970B6AF; Wed, 11 Oct 2023 16:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697066113; bh=Qf1p2gVy4rqI/LsmbKaNjjPoD1EJg71MiJ3nDq8hLn4=; h=Date:From:To:Cc:Subject:From; b=oN084AUlbbXslRvm0WWW2JUyVkSaZRiFxYgiHG4tYgSNAuez+ngdfO+kEPEBtfR1c UlR7FUEK5rWZPzteTsy1poOrjgrbV09GZSsW3e6iEmgQZLXtGxT0zUwD3FjisC0b6y JFmc76NI/AFsqQr015nOXI8pgTVQC6KktuL0Z4SsaUwdNnEwWFJt9c8AjqwtiNngBM ZDl0hMvom7H6KLuiB8fpEQYT13zIr2wELV5sovMzJr1LPHJXWHlMsAOnSM5bkoy8kE xO5eiiK2//ykgVHoAcavgCqL5BHm2f9a/7nL3D3Ns162A1H3aHwwK/vRBAv3BzSSCK ORnCX9BT4Fvvw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S5TBl3TY2z4xVW; Thu, 12 Oct 2023 10:15:11 +1100 (AEDT) Date: Thu, 12 Oct 2023 10:14:34 +1100 From: Stephen Rothwell To: Shawn Guo , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Frank Li , Haibo Chen , Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde Subject: linux-next: manual merge of the imx-mxs tree with the net tree Message-ID: <20231012101434.1e5e7340@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 11 Oct 2023 16:15:36 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779502823245329186 X-GMAIL-MSGID: 1779502823245329186 Hi all, Today's linux-next merge of the imx-mxs tree got a conflict in: arch/arm64/boot/dts/freescale/imx93.dtsi between commit: 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR") from the net tree and commit: d34d2aa594d0 ("arm64: dts: imx93: add edma1 and edma2") from the imx-mxs 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 arch/arm64/boot/dts/freescale/imx93.dtsi index dcf6e4846ac9,4a0d604fd0db..000000000000 --- a/arch/arm64/boot/dts/freescale/imx93.dtsi