linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2020-05-15  5:28 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2020-05-15  5:28 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Alex Elder

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/net/qcom,ipa.yaml

between commit:

  8456c54408a2 ("dt-bindings: net: add IPA iommus property")

from the net-next tree and commit:

  fba5618451d2 ("dt-bindings: Fix incorrect 'reg' property sizes")

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/qcom,ipa.yaml
index 7b749fc04c32,b2ac7606095b..000000000000
--- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml
+++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
@@@ -171,10 -162,9 +169,10 @@@ examples
                  modem-init;
                  modem-remoteproc = <&mss_pil>;
  
 +                iommus = <&apps_smmu 0x720 0x3>;
-                 reg = <0 0x1e40000 0 0x7000>,
-                         <0 0x1e47000 0 0x2000>,
-                         <0 0x1e04000 0 0x2c000>;
+                 reg = <0x1e40000 0x7000>,
+                         <0x1e47000 0x2000>,
+                         <0x1e04000 0x2c000>;
                  reg-names = "ipa-reg",
                              "ipa-shared",
                              "gsi";

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2021-02-22 10:35     ` Grygorii Strashko
@ 2021-02-22 21:12       ` Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2021-02-22 21:12 UTC (permalink / raw)
  To: Grygorii Strashko
  Cc: Rob Herring, David Miller, Networking, Jakub Kicinski,
	Linux Kernel Mailing List, Linux Next Mailing List, Rob Herring

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

Hi Grygorii,

On Mon, 22 Feb 2021 12:35:10 +0200 Grygorii Strashko <grygorii.strashko@ti.com> wrote:
>
> Sorry for inconvenience, is there anything I can do to help resolve it?
> (Changes went through a different trees)

No, it is fine.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2021-02-22  8:23   ` Stephen Rothwell
@ 2021-02-22 10:35     ` Grygorii Strashko
  2021-02-22 21:12       ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Grygorii Strashko @ 2021-02-22 10:35 UTC (permalink / raw)
  To: Stephen Rothwell, Rob Herring, David Miller, Networking
  Cc: Jakub Kicinski, Linux Kernel Mailing List,
	Linux Next Mailing List, Rob Herring



On 22/02/2021 10:23, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 21 Jan 2021 13:26:45 +1100 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/ti,k3-am654-cpsw-nuss.yaml
>>>
>>> between commit:
>>>
>>>    19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g")
>>>
>>> from the net-next tree and commit:
>>>
>>>    0499220d6dad ("dt-bindings: Add missing array size constraints")
>>>
>>> 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.
>>>
>>> diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> index 3fae9a5f0c6a,097c5cc6c853..000000000000
>>> --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> @@@ -72,7 -66,8 +72,8 @@@ properties
>>>      dma-coherent: true
>>>    
>>>      clocks:
>>> +     maxItems: 1
>>>   -    description: CPSW2G NUSS functional clock
>>>   +    description: CPSWxG NUSS functional clock
>>>    
>>>      clock-names:
>>>        items:
>>
>> With the merge window about to open, this is a reminder that this
>> conflict still exists.
> 
> This is now a conflict between the devicetree tree and Linus' tree.
> 

Sorry for inconvenience, is there anything I can do to help resolve it?
(Changes went through a different trees)

-- 
Best regards,
grygorii

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2021-02-14 20:53 ` Stephen Rothwell
@ 2021-02-22  8:23   ` Stephen Rothwell
  2021-02-22 10:35     ` Grygorii Strashko
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2021-02-22  8:23 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Grygorii Strashko, Jakub Kicinski, Linux Kernel Mailing List,
	Linux Next Mailing List, Rob Herring

[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]

Hi all,

On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 21 Jan 2021 13:26:45 +1100 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/ti,k3-am654-cpsw-nuss.yaml
> > 
> > between commit:
> > 
> >   19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g")
> > 
> > from the net-next tree and commit:
> > 
> >   0499220d6dad ("dt-bindings: Add missing array size constraints")
> > 
> > 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.
> > 
> > diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> > index 3fae9a5f0c6a,097c5cc6c853..000000000000
> > --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> > +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> > @@@ -72,7 -66,8 +72,8 @@@ properties
> >     dma-coherent: true
> >   
> >     clocks:
> > +     maxItems: 1
> >  -    description: CPSW2G NUSS functional clock
> >  +    description: CPSWxG NUSS functional clock
> >   
> >     clock-names:
> >       items:  
> 
> With the merge window about to open, this is a reminder that this
> conflict still exists.

This is now a conflict between the devicetree tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2021-01-21  2:26 Stephen Rothwell
@ 2021-02-14 20:53 ` Stephen Rothwell
  2021-02-22  8:23   ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2021-02-14 20:53 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Grygorii Strashko, Jakub Kicinski, Linux Kernel Mailing List,
	Linux Next Mailing List, Rob Herring

[-- Attachment #1: Type: text/plain, Size: 1563 bytes --]

Hi all,

On Thu, 21 Jan 2021 13:26:45 +1100 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/ti,k3-am654-cpsw-nuss.yaml
> 
> between commit:
> 
>   19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g")
> 
> from the net-next tree and commit:
> 
>   0499220d6dad ("dt-bindings: Add missing array size constraints")
> 
> 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.
> 
> diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> index 3fae9a5f0c6a,097c5cc6c853..000000000000
> --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
> @@@ -72,7 -66,8 +72,8 @@@ properties
>     dma-coherent: true
>   
>     clocks:
> +     maxItems: 1
>  -    description: CPSW2G NUSS functional clock
>  +    description: CPSWxG NUSS functional clock
>   
>     clock-names:
>       items:

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2021-01-21  2:26 Stephen Rothwell
  2021-02-14 20:53 ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2021-01-21  2:26 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Grygorii Strashko, Jakub Kicinski, Linux Kernel Mailing List,
	Linux Next Mailing List, Rob Herring

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml

between commit:

  19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g")

from the net-next tree and commit:

  0499220d6dad ("dt-bindings: Add missing array size constraints")

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/ti,k3-am654-cpsw-nuss.yaml
index 3fae9a5f0c6a,097c5cc6c853..000000000000
--- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
+++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
@@@ -72,7 -66,8 +72,8 @@@ properties
    dma-coherent: true
  
    clocks:
+     maxItems: 1
 -    description: CPSW2G NUSS functional clock
 +    description: CPSWxG NUSS functional clock
  
    clock-names:
      items:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2019-06-28  4:56 Stephen Rothwell
@ 2019-07-09  0:15 ` Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2019-07-09  0:15 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Heiner Kallweit, Maxime Ripard

[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]

Hi all,

On Fri, 28 Jun 2019 14:56:26 +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/ethernet.txt
> 
> between commit:
> 
>   79b647a0c0d5 ("dt-bindings: net: document new usxgmii phy mode")
> 
> from the net-next tree and commit:
> 
>   4e7a33bff7d7 ("dt-bindings: net: Add YAML schemas for the generic Ethernet options")
> 
> from the devicetree tree.
> 
> I fixed it up (the latter seems to include the change made by the former,
> so I just used the latter) 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.

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2019-06-28  4:56 Stephen Rothwell
  2019-07-09  0:15 ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2019-06-28  4:56 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Heiner Kallweit, Maxime Ripard

[-- Attachment #1: Type: text/plain, Size: 872 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/net/ethernet.txt

between commit:

  79b647a0c0d5 ("dt-bindings: net: document new usxgmii phy mode")

from the net-next tree and commit:

  4e7a33bff7d7 ("dt-bindings: net: Add YAML schemas for the generic Ethernet options")

from the devicetree tree.

I fixed it up (the latter seems to include the change made by the former,
so I just used the latter) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2018-07-30  4:37 Stephen Rothwell
@ 2018-08-15  3:14 ` Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2018-08-15  3:14 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Rob Herring, Linux-Next Mailing List, Linux Kernel Mailing List,
	Anssi Hannula

[-- 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 --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2018-07-30  4:37 Stephen Rothwell
  2018-08-15  3:14 ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2018-07-30  4:37 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Anssi Hannula

[-- Attachment #1: Type: text/plain, Size: 2647 bytes --]

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:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2017-06-23  3:37 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2017-06-23  3:37 UTC (permalink / raw)
  To: Rob Herring, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Russell King,
	Frank Rowand

Hi Rob,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/net/ethernet.txt

between commit:

  c125ca091873 ("net: phy: add XAUI and 10GBASE-KR PHY connection types")

from the net-next tree and commit:

  076fb0c4b6e1 ("of: update ePAPR references to point to Devicetree Specification")

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/ethernet.txt
index d4abe9a98109,08dd263beeb9..000000000000
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@@ -32,11 -33,11 +33,13 @@@ The following properties are common to 
    * "2000base-x",
    * "2500base-x",
    * "rxaui"
 +  * "xaui"
 +  * "10gbase-kr" (10GBASE-KR, XFI, SFI)
- - phy-connection-type: the same as "phy-mode" property but described in ePAPR;
+ - phy-connection-type: the same as "phy-mode" property but described in the
+   Devicetree Specification;
  - phy-handle: phandle, specifies a reference to a node representing a PHY
-   device; this property is described in ePAPR and so preferred;
+   device; this property is described in the Devicetree Specification and so
+   preferred;
  - phy: the same as "phy-handle" property, not recommended for new bindings.
  - phy-device: the same as "phy-handle" property, not recommended for new
    bindings.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the net-next tree
  2014-02-14  3:16 Stephen Rothwell
@ 2014-02-14  3:47 ` Florian Fainelli
  0 siblings, 0 replies; 13+ messages in thread
From: Florian Fainelli @ 2014-02-14  3:47 UTC (permalink / raw)
  To: Stephen Rothwell, Grant Likely, David Miller, netdev
  Cc: linux-next, linux-kernel

Hi Stephen,

Le 13/02/2014 19:16, Stephen Rothwell a écrit :
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/of/of_net.c between commit 8a2fe56e8827 ("net: phy: re-design
> phy_modes to be self-contained") from the net-next tree and commit
> cf4c9eb5a451 ("of: make of_get_phy_mode parse 'phy-connection-type'")
> from the devicetree tree.
>
> I fixed it up (I applied the following merge fix patch) and can carry the
> fix as necessary (no action is required).

Looks good to me, thanks for fixing that!

>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 14 Feb 2014 14:14:31 +1100
> Subject: [PATCH] net: of: merges fix for a moved comment
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   include/linux/phy.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index 42f1bc7eaeb0..bc77c174e0a3 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -79,8 +79,8 @@ typedef enum {
>
>   /**
>    * It maps 'enum phy_interface_t' found in include/linux/phy.h
> - * into the device tree binding of 'phy-mode', so that Ethernet
> - * device driver can get phy interface from device tree.
> + * into the device tree binding of 'phy-mode' or 'phy-connection-type',
> + * so that Ethernet device driver can get phy interface from device tree.
>    */
>   static inline const char *phy_modes(phy_interface_t interface)
>   {
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: manual merge of the devicetree tree with the net-next tree
@ 2014-02-14  3:16 Stephen Rothwell
  2014-02-14  3:47 ` Florian Fainelli
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2014-02-14  3:16 UTC (permalink / raw)
  To: Grant Likely, David Miller, netdev
  Cc: linux-next, linux-kernel, Florian Fainelli

[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/of_net.c between commit 8a2fe56e8827 ("net: phy: re-design
phy_modes to be self-contained") from the net-next tree and commit
cf4c9eb5a451 ("of: make of_get_phy_mode parse 'phy-connection-type'")
from the devicetree tree.

I fixed it up (I applied the following merge fix patch) and can carry the
fix as necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Feb 2014 14:14:31 +1100
Subject: [PATCH] net: of: merges fix for a moved comment

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/phy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 42f1bc7eaeb0..bc77c174e0a3 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -79,8 +79,8 @@ typedef enum {
 
 /**
  * It maps 'enum phy_interface_t' found in include/linux/phy.h
- * into the device tree binding of 'phy-mode', so that Ethernet
- * device driver can get phy interface from device tree.
+ * into the device tree binding of 'phy-mode' or 'phy-connection-type',
+ * so that Ethernet device driver can get phy interface from device tree.
  */
 static inline const char *phy_modes(phy_interface_t interface)
 {
-- 
1.9.0.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-02-22 21:13 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-15  5:28 linux-next: manual merge of the devicetree tree with the net-next tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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
2019-06-28  4:56 Stephen Rothwell
2019-07-09  0:15 ` Stephen Rothwell
2018-07-30  4:37 Stephen Rothwell
2018-08-15  3:14 ` Stephen Rothwell
2017-06-23  3:37 Stephen Rothwell
2014-02-14  3:16 Stephen Rothwell
2014-02-14  3:47 ` Florian Fainelli

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