Subject: linux-next: manual merge of the devicetree tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Jul 2018 14:37:22 +1000

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.

-- 
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
  ---------------------------------------------------------
  
  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).

  Example: