From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1E92C433E6 for ; Thu, 18 Feb 2021 04:51:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CEF764E3E for ; Thu, 18 Feb 2021 04:51:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CEF764E3E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-ID:Subject: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:List-Owner; bh=1KFxQySVfcy0pavnP1cBQf6hIBb/MYW0bZBGhrJ712s=; b=Dlc/o60T/mSvKNvhwvXpmPYIM ZaoEBEEITMWciIUmgTp7QGuP9z+4J3ZH86nXerSn2TnVn6x5AIRWiPD+DjHKMMUZ4p7eFGErL1n89 nNKVp6GNY2liJ3J/k/WfUp/DfuUYY8K2fZJZslPDQd0/ByVrfggka/7uTrQwfbVYWfOU/ng81e6UO NrWDJrF1+b94eb04wxiIfyw2B0qJbgR5bTO7DP+zNybhZF8bU5/6iv5SKOLIb70CZ5GHHyvyFS93p lgGbAga1oSWMjUIlz+PQFWFyIToNRwW4W5ori8JW7CElfUgZyjE7dP7d2Y2REVRxRHJPPPgEgBWcd S9MWOxO3Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCbFf-0006Ma-0H; Thu, 18 Feb 2021 04:49:19 +0000 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCbFa-0006Lo-N4 for linux-arm-kernel@lists.infradead.org; Thu, 18 Feb 2021 04:49:16 +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 4Dh2Kk58Ssz9sSC; Thu, 18 Feb 2021 15:48:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613623747; bh=U3pXJmB/9mHsJ9I2grqn2rpy0G5O3rUt2PR33nNR7ts=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WOdFP5BWDC4PVDQX3aHnTLcUXgg7NgiMvsXIe092iiFP+sItHIJyZ7jqKY/ROhkDV 3x7pEEsI9ubfWAtVPJm20Qwx7uxfd4wIsAdLSP2ogvpclA4+H7ek+a3KGoML2Lb32s +CvhmGrJH9t3lGXlY8X06vwaOjIMp3+Ln2OTuk4rP2Te/7AOjbzkEGBG4RKGI9EhIb uz9BnfqBvNx8SKspw9HQGGzbh8jaOUVr4GCCgwH72EQ8zy9Wc1IEhFWXjhIDR+PRRX mlqTZd45h0sOiLALxj/RN9znQ3Sdpc+vIHHhL7jSkmdwXgVWx/ASvUxLZ/j0g4NIoh +B9/sYTlgXRkQ== Date: Thu, 18 Feb 2021 15:48:57 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Subject: Re: linux-next: manual merge of the irqchip tree with the sunxi tree Message-ID: <20210218154857.75bad5df@canb.auug.org.au> In-Reply-To: <20210215091124.46c005ad@canb.auug.org.au> References: <20210201144259.102ae6ab@canb.auug.org.au> <20210215091124.46c005ad@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210217_234915_192040_71852FDC X-CRM114-Status: GOOD ( 25.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Holland , Marc Zyngier , Linux Kernel Mailing List , Maxime Ripard , Paul Kocialkowski , Chen-Yu Tsai , Linux Next Mailing List , Maxime Ripard Content-Type: multipart/mixed; boundary="===============6399261506642706525==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============6399261506642706525== Content-Type: multipart/signed; boundary="Sig_/81Mwa=wdGo=IUKVht5j+jdK"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/81Mwa=wdGo=IUKVht5j+jdK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 15 Feb 2021 09:11:24 +1100 Stephen Rothwell = wrote: > > On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell = wrote: > > > > Today's linux-next merge of the irqchip tree got a conflict in: > >=20 > > Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7= i-a20-sc-nmi.yaml > >=20 > > between commit: > >=20 > > 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation= for the V3s NMI") > >=20 > > from the sunxi tree and commit: > >=20 > > ad6b47cdef76 ("dt-bindings: irq: sun6i-r: Split the binding from sun7= i-nmi") > >=20 > > from the irqchip tree. > >=20 > > I fixed it up (I think - 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. > >=20 > > diff --cc Documentation/devicetree/bindings/interrupt-controller/allwin= ner,sun7i-a20-sc-nmi.yaml > > index 4fd1e2780026,f34ecc8c7093..000000000000 > > --- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,= sun7i-a20-sc-nmi.yaml > > +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,= sun7i-a20-sc-nmi.yaml > > @@@ -25,17 -25,7 +25,10 @@@ properties > > - const: allwinner,sun6i-a31-sc-nmi > > deprecated: true > > - const: allwinner,sun7i-a20-sc-nmi > > - - items: > > - - const: allwinner,sun8i-a83t-r-intc > > - - const: allwinner,sun6i-a31-r-intc > > + - items: > > + - const: allwinner,sun8i-v3s-nmi > > + - const: allwinner,sun9i-a80-nmi > > - const: allwinner,sun9i-a80-nmi > > - - items: > > - - const: allwinner,sun50i-a64-r-intc > > - - const: allwinner,sun6i-a31-r-intc > > - items: > > - const: allwinner,sun50i-a100-nmi > > - const: allwinner,sun9i-a80-nmi =20 >=20 > With the merge window about to open, this is a reminder that this > conflict still exists. It is now between the arm-soc tree and the > irqchip tree. This is now a conflict between the arm-soc tree and the tip tree. --=20 Cheers, Stephen Rothwell --Sig_/81Mwa=wdGo=IUKVht5j+jdK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAt8bkACgkQAVBC80lX 0GxAmgf/QddCsP/621qMYpNzwzYcGTi0/qD4s82f14UQzRZ1/0U60Pj0Bm5hr7Ci a4mY58RUibDy/ODyBJI7HfYdiNhH6Dqz6WY2SCKZ+scVMXgKzlJS6qyRlPUFQmCB 3q64uLJhoMySuvpN34xHu43RwYGnCe3NfpouLu5acOINQAlQFKQy8OtusmEmc3zl 3l1rv/uIuJwF3Ylt6ukBlt6OThMCWsJ3+WqnN+kCes8QA4OuBbQ2ipGzGqB5qCRd bLfYG4HmRByeO1b6SEZgjPtXsMouDUeQE+cDHSlvw04sTs5AHrRecZZ2n0n+druW vVFxdE9kgr6Ajr5GVSTiXaOUX7sJKw== =NeFd -----END PGP SIGNATURE----- --Sig_/81Mwa=wdGo=IUKVht5j+jdK-- --===============6399261506642706525== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============6399261506642706525==--