linux-next: manual merge of the net-next tree with the clk tree

linux-next: manual merge of the net-next tree with the clk tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt

between commit:

  7b9e111a5216 ("dt-bindings: clock: mediatek: document clk bindings for Mediatek MT6765 SoC")

from the clk tree and commit:

  9f9d1e63dc55 ("dt-bindings: convert the binding document for mediatek PERICFG to yaml")

from the net-next tree.

I fixed it up (I deleted the file and added the following patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jun 2020 12:07:03 +1000
Subject: [PATCH] dt-bindings: fix up for "dt-bindings: clock: mediatek:
 document clk bindings for Mediatek MT6765 SoC"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 .../devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
index 55209a2baedc..e271c4682ebc 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
@@ -20,6 +20,7 @@ properties:
         - enum:
           - mediatek,mt2701-pericfg
           - mediatek,mt2712-pericfg
+          - mediatek,mt6765-pericfg
           - mediatek,mt7622-pericfg
           - mediatek,mt7629-pericfg
           - mediatek,mt8135-pericfg
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the net-next tree with the clk tree

[Stephen Rothwell]

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

Hi all,

On Tue, 2 Jun 2020 12:09:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
> 
> between commit:
> 
>   7b9e111a5216 ("dt-bindings: clock: mediatek: document clk bindings for Mediatek MT6765 SoC")
> 
> from the clk tree and commit:
> 
>   9f9d1e63dc55 ("dt-bindings: convert the binding document for mediatek PERICFG to yaml")
> 
> from the net-next tree.
> 
> I fixed it up (I deleted the file and added the following patch) 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.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Jun 2020 12:07:03 +1000
> Subject: [PATCH] dt-bindings: fix up for "dt-bindings: clock: mediatek:
>  document clk bindings for Mediatek MT6765 SoC"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  .../devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml       | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
> index 55209a2baedc..e271c4682ebc 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml
> @@ -20,6 +20,7 @@ properties:
>          - enum:
>            - mediatek,mt2701-pericfg
>            - mediatek,mt2712-pericfg
> +          - mediatek,mt6765-pericfg
>            - mediatek,mt7622-pericfg
>            - mediatek,mt7629-pericfg
>            - mediatek,mt8135-pericfg
> -- 
> 2.26.2

This merge resolution patch is now needed when the clk tree merges with
Linus' tree

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the net-next tree with the clk tree

[broonie]

Hi all,

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

  MAINTAINERS

between commit:

  63a30e1f44d5e ("MAINTAINERS: generalise StarFive clk/reset entries")

from the clk tree and commit:

  b76eaf7d7ede3 ("dt-bindings: net: Add support StarFive dwmac")

from the net-next 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 MAINTAINERS
index 8c77a6a3f2c56,4fc57dfd5fd0a..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19911,6 -19928,20 +19937,13 @@@ M:	Emil Renner Berthing <kernel@esmil.d
  S:	Maintained
  F:	arch/riscv/boot/dts/starfive/
  
+ STARFIVE DWMAC GLUE LAYER
+ M:	Emil Renner Berthing <kernel@esmil.dk>
+ M:	Samin Guo <samin.guo@starfivetech.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+ F:	drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+ 
 -STARFIVE JH7100 CLOCK DRIVERS
 -M:	Emil Renner Berthing <kernel@esmil.dk>
 -S:	Maintained
 -F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 -F:	drivers/clk/starfive/clk-starfive-jh7100*
 -F:	include/dt-bindings/clock/starfive-jh7100*.h
 -
  STARFIVE JH7110 MMC/SD/SDIO DRIVER
  M:	William Qiu <william.qiu@starfivetech.com>
  S:	Supported