From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Cc: Rob Herring <robherring2@gmail.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Anssi Hannula <anssi.hannula@bitwise.fi>
Subject: Re: linux-next: manual merge of the devicetree tree with the net-next tree
Date: Wed, 15 Aug 2018 13:14:02 +1000 [thread overview]
Message-ID: <20180815131402.271492d4@canb.auug.org.au> (raw)
In-Reply-To: <20180730143645.7bcd563b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2966 bytes --]
Hi all,
On Mon, 30 Jul 2018 14:37:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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:
This is now a conflict between Linus' tree and the net-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-08-15 3:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 4:37 linux-next: manual merge of the devicetree tree with the net-next tree Stephen Rothwell
2018-08-15 3:14 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-29 1:50 Stephen Rothwell
2021-01-21 2:26 Stephen Rothwell
2021-02-14 20:53 ` Stephen Rothwell
2021-02-22 8:23 ` Stephen Rothwell
2021-02-22 10:35 ` Grygorii Strashko
2021-02-22 21:12 ` Stephen Rothwell
2020-05-15 5:28 Stephen Rothwell
2019-06-28 4:56 Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
2017-06-23 3:37 Stephen Rothwell
2014-02-14 3:16 Stephen Rothwell
2014-02-14 3:47 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180815131402.271492d4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anssi.hannula@bitwise.fi \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robherring2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).