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 7F93CC433DB for ; Fri, 26 Feb 2021 10:24:13 +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 0384D64EED for ; Fri, 26 Feb 2021 10:24:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0384D64EED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=paulk.fr 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-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ymKg3qQa7eVB62mJa3dhYXu1HqcrbEuX4oXjXpwH9HQ=; b=pCRDpx1Mm92fusTHlX35qP43S EXcuwviqvMKF5DjeJeNaWatAfbgGi0KCVIgODUQP0cYEHhTtnvJu1kywxHiMsGO1cvZfoNutfHwmw +cdyw5Kq4rB8e/2VyCM3RHq8mVgydL/wR/kd0HKs99K8eJLF5M5BkOJE4vRxuSvt4eRShiuXA0HO7 Dlj2lexymaH0gIX8B0/TbagMJpKjSCH3ndZDUT6xvLIi7lj0n0dVyGq+7VRlgL53Zh2nJNVLLhdFd 2RT8l+1vbwA+L/8/Hwe1dJina1fgiIdo9FErQDBqg66vhoobe9yv83Vtjw7mElXrdScugDBjHqyw0 4LvjTQHSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFaGd-0001Im-TK; Fri, 26 Feb 2021 10:22:39 +0000 Received: from leonov.paulk.fr ([185.233.101.22]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFaGa-0001Hr-Qv for linux-arm-kernel@lists.infradead.org; Fri, 26 Feb 2021 10:22:38 +0000 Received: from gagarine.paulk.fr (gagarine [192.168.1.127]) by leonov.paulk.fr (Postfix) with ESMTPS id 21E25C0150 for ; Fri, 26 Feb 2021 11:22:33 +0100 (CET) Received: by gagarine.paulk.fr (Postfix, from userid 114) id 17D9EC1E78; Fri, 26 Feb 2021 11:22:32 +0100 (CET) Received: from aptenodytes (unknown [192.168.1.1]) by gagarine.paulk.fr (Postfix) with ESMTPSA id 1D145C1E76; Fri, 26 Feb 2021 11:22:16 +0100 (CET) Date: Fri, 26 Feb 2021 11:22:15 +0100 From: Paul Kocialkowski To: Stephen Rothwell Subject: Re: linux-next: manual merge of the irqchip tree with the sunxi tree Message-ID: References: <20210201144259.102ae6ab@canb.auug.org.au> <20210215091124.46c005ad@canb.auug.org.au> <20210218154857.75bad5df@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210218154857.75bad5df@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210226_052237_114281_9780D786 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: Arnd Bergmann , Samuel Holland , Peter Zijlstra , Marc Zyngier , Linux Kernel Mailing List , Maxime Ripard , Chen-Yu Tsai , Linux Next Mailing List , Maxime Ripard , "H. Peter Anvin" , Olof Johansson , Thomas Gleixner , Ingo Molnar , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Thu 18 Feb 21, 15:48, Stephen Rothwell wrote: > 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: > > > > > > Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > > > > > between commit: > > > > > > 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation for the V3s NMI") > > > > > > from the sunxi tree and commit: > > > > > > ad6b47cdef76 ("dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi") > > > > > > from the irqchip tree. > > > > > > 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. > > > > > > diff --cc Documentation/devicetree/bindings/interrupt-controller/allwinner,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 > > > > 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. The resolution looks correct to me! Cheers, Paul -- Developer of free digital technology and hardware support. Website: https://www.paulk.fr/ Coding blog: https://code.paulk.fr/ Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel