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=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 440F4C46464 for ; Wed, 15 Aug 2018 03:14:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE34721535 for ; Wed, 15 Aug 2018 03:14:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="D+ufAjMw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE34721535 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-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728691AbeHOGEU (ORCPT ); Wed, 15 Aug 2018 02:04:20 -0400 Received: from ozlabs.org ([203.11.71.1]:50879 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726003AbeHOGEU (ORCPT ); Wed, 15 Aug 2018 02:04:20 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 41qvgv0QGXz9ryt; Wed, 15 Aug 2018 13:14:03 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1534302844; bh=eUHk4DSz3Yujwmz9pzh5ayJJLKbum7l/gg5rjB5QxBY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=D+ufAjMw9yYC8z3qKFUTD4sNbrXJBnC9Z/d6Dh+pmL6WWA7u19tWSxNF6ZDOK3/2L 6kayQ6gDHVhl8/QxxX+o/gS5tRhEkYh1YcFec7ZXVagNjS8t2wO682532nM2JQcgRb If6H/F8M3wn2+cVOBKHswwLQOo/l6Dy2vXlaEwiHGFEXk7A6GDKEQGs/fTEBMVe6h6 d3t20jachRR7fTJQB+RbagYzYU5Ouj4Brg3AcMHHgWs3PzO+/4dVp6YZjfHUKmDOr6 If3F/ZkZ/JtqXPt2fsue0loZF4aMow9wbLFavo5Z0H20jfob8dlG04zauQ3C5j1zkM s6n1aZyPtmjOw== Date: Wed, 15 Aug 2018 13:14:02 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Rob Herring , Linux-Next Mailing List , Linux Kernel Mailing List , Anssi Hannula Subject: Re: linux-next: manual merge of the devicetree tree with the net-next tree Message-ID: <20180815131402.271492d4@canb.auug.org.au> In-Reply-To: <20180730143645.7bcd563b@canb.auug.org.au> References: <20180730143645.7bcd563b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/eRuCqZV7WcAk3=1A0PnXURk"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/eRuCqZV7WcAk3=1A0PnXURk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 30 Jul 2018 14:37:22 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: >=20 > Documentation/devicetree/bindings/net/can/xilinx_can.txt >=20 > between commit: >=20 > 7cb0f17f5252 ("dt-bindings: can: xilinx_can: add Xilinx CAN FD bindings= ") >=20 > from the net-next tree and commit: >=20 > 791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings") >=20 > from the devicetree tree. >=20 > 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. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > diff --cc Documentation/devicetree/bindings/net/can/xilinx_can.txt > index ae5c07e96ad5,9264d2f6a89d..000000000000 > --- a/Documentation/devicetree/bindings/net/can/xilinx_can.txt > +++ b/Documentation/devicetree/bindings/net/can/xilinx_can.txt > @@@ -2,26 -2,19 +2,25 @@@ Xilinx Axi CAN/Zynq CANPS controller De > --------------------------------------------------------- > =20 > Required properties: > -- compatible : Should be "xlnx,zynq-can-1.0" for Zynq CAN > - controllers and "xlnx,axi-can-1.00.a" for Axi CAN > - controllers. > -- reg : Physical base address and size of the Axi CAN/Zynq > - CANPS registers map. > +- compatible : Should be: > + - "xlnx,zynq-can-1.0" for Zynq CAN controllers > + - "xlnx,axi-can-1.00.a" for Axi CAN controllers > + - "xlnx,canfd-1.0" for CAN FD controllers > +- reg : Physical base address and size of the controller > + registers map. > - interrupts : Property with a value describing the interrupt > number. > - - interrupt-parent : Must be core interrupt controller > -- clock-names : List of input clock names - "can_clk", "pclk" > - (For CANPS), "can_clk" , "s_axi_aclk"(For AXI CAN) > +- clock-names : List of input clock names > + - "can_clk", "pclk" (For CANPS), > + - "can_clk", "s_axi_aclk" (For AXI CAN and CAN FD). > (See clock bindings for details). > - clocks : Clock phandles (see clock bindings for details). > -- tx-fifo-depth : Can Tx fifo depth. > -- rx-fifo-depth : Can Rx fifo depth. > +- tx-fifo-depth : Can Tx fifo depth (Zynq, Axi CAN). > +- rx-fifo-depth : Can Rx fifo depth (Zynq, Axi CAN, CAN FD in > + sequential Rx mode). > +- tx-mailbox-count : Can Tx mailbox buffer count (CAN FD). > +- rx-mailbox-count : Can Rx mailbox buffer count (CAN FD in mailbox Rx > + mode). > =20 > =20 > Example: This is now a conflict between Linus' tree and the net-next tree. --=20 Cheers, Stephen Rothwell --Sig_/eRuCqZV7WcAk3=1A0PnXURk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltzmnoACgkQAVBC80lX 0GwsfAf/QBzY8MOdmPMAIi1qVMd2lEB4oHaLJedfvRyg713C/dLjcgrOgcCPQkZZ 7iCVfNpM1fSzd0lgqKznd3UaCvYGLw+wMo1FvEiXu9LFdyyTTt40ZyH8uVSyS/k6 qeKdtItoKAEtrrN4A9qzbeAevNWu4MeVIPgRajcl/dJt9lQpqAl/IgCR4r0+tAQh Z7OPmuCebxjkScS6geZ7mCaOhD7uM0fM+HwHrNgygtXRRAg0Abk3CKXN7yn8Dize nRwR2lwGp/Ls7w+FAwHvvdTlftxNBXlzW7dLVS9LsGx79/eLloXiFB6BOUgTsAqJ FZHOhSKvVCmDx4k+t+eQfkrMCASgrg== =pSFu -----END PGP SIGNATURE----- --Sig_/eRuCqZV7WcAk3=1A0PnXURk--