Hi all, Today's linux-next merge of the net-next tree got a conflict in: Documentation/devicetree/bindings/net/renesas,ravb.txt between commit: 307eea32b202 ("dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC") from the net tree and commit: d7adf6331189 ("dt-bindings: net: renesas,etheravb: Convert to json-schema") 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 Date: Fri, 2 Oct 2020 12:57:33 +1000 Subject: [PATCH] fix up for "dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC" Signed-off-by: Stephen Rothwell --- Documentation/devicetree/bindings/net/renesas,etheravb.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/renesas,etheravb.yaml b/Documentation/devicetree/bindings/net/renesas,etheravb.yaml index e13653051b23..244befb6402a 100644 --- a/Documentation/devicetree/bindings/net/renesas,etheravb.yaml +++ b/Documentation/devicetree/bindings/net/renesas,etheravb.yaml @@ -31,6 +31,7 @@ properties: - renesas,etheravb-r8a774a1 # RZ/G2M - renesas,etheravb-r8a774b1 # RZ/G2N - renesas,etheravb-r8a774c0 # RZ/G2E + - renesas,etheravb-r8a774e1 # RZ/G2H - renesas,etheravb-r8a7795 # R-Car H3 - renesas,etheravb-r8a7796 # R-Car M3-W - renesas,etheravb-r8a77961 # R-Car M3-W+ -- 2.28.0 -- Cheers, Stephen Rothwell