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 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 3D1E4FD21E1 for ; Mon, 30 Jul 2018 04:37:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0AEB20870 for ; Mon, 30 Jul 2018 04:37:44 +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="U8SQxIyc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0AEB20870 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 S1726481AbeG3GKc (ORCPT ); Mon, 30 Jul 2018 02:10:32 -0400 Received: from ozlabs.org ([203.11.71.1]:52735 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726015AbeG3GKc (ORCPT ); Mon, 30 Jul 2018 02:10:32 -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 41f6HQ3qBhz9ryt; Mon, 30 Jul 2018 14:37:22 +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=1532925445; bh=OiPNEpMgav7fCurqgX34qz8H2YA4xMU0Ej35zsr1U08=; h=Date:From:To:Cc:Subject:From; b=U8SQxIycEXepc0f8jwck3qYFqVNBsgdUaCwfvK4ar24rBkW21z6uK8cipwScUDW3z f4ERg6ZlYYLQLggTEZKPpw5osZPmZFMcnRx7E5GXmHHLDuCkqsrZVfOhtBXBjnV/rg Hg6ZnGwuqa/p3k6+laIrILVD3MxiEvUbvKLkxGt/rxwukMHVUBMWhWO3+DnE2S03ZN tZsWi5VpReD2UohC89AkQbZCNqkeAvy4DzRoQELEjcMzmpEMImLfJHk9mHYcjVGyQd KK11eLJIlULO8ZXcgY3TMnfbQyYByGbANlgaa8vxUOrR3yjRA9fomCOqYr0BCDnvE3 QM8UTtjFJJijw== Date: Mon, 30 Jul 2018 14:37:22 +1000 From: Stephen Rothwell To: Rob Herring , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Anssi Hannula Subject: linux-next: manual merge of the devicetree tree with the net-next tree Message-ID: <20180730143645.7bcd563b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/bvAwNpaLdF0NX7E6RjKubJt"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/bvAwNpaLdF0NX7E6RjKubJt Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Rob, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/net/can/xilinx_can.txt between commit: 7cb0f17f5252 ("dt-bindings: can: xilinx_can: add Xilinx CAN FD bindings") from the net-next tree and commit: 791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings") from the devicetree 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. --=20 Cheers, Stephen Rothwell 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: --Sig_/bvAwNpaLdF0NX7E6RjKubJt Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltelgIACgkQAVBC80lX 0Gz2BggAmD+uRdeDhdmU9aBIGayob3Pg4iKHJRCNBE/cXAiogMJOQfivCGL9So05 9pO7aQ5s5opiCB+jAEPC8yUfGI7CvBaih6zZ2lEvN4pIF4qoEm2NOW55KMFTbbsf vag73QmCTnBdcULcOmT3GeL3TNf+rC1VgMvwhoetf6Qi1o2+lL0vZvQ+a3HnAR9n NBM6126sSWPTIbVkELdSHWvtd382xVCDYQebeQDfRbgHQWTdklcgKteAA6F9OxEp KYjTQ/f2m6/3N9iAkRvt0YnLGKijeVYz3V1gIei+NYm8kGzgE9RU5kWWTZaRy8bt z/P+MpJUz7yrr7+sGUuNUyx8SkTkDQ== =JtaR -----END PGP SIGNATURE----- --Sig_/bvAwNpaLdF0NX7E6RjKubJt--