| Message ID | 20191114132131.56089c64@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the devicetree tree with the arm-soc tree | expand |
Hi all, This is now a conflict between the arm-soc tree and Linus' tree. On Thu, 14 Nov 2019 13:21:31 +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/gpu/arm,mali-midgard.yaml > > between commit: > > 577dd5de0990 ("arm64: dts: juno: add GPU subsystem") > > from the arm-soc tree and commit: > > 3afd6389f320 ("dt-bindings: gpu: mali-midgard: add samsung exynos 5420 compatible") > > 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/gpu/arm,mali-midgard.yaml > index 018f3ae4b43c,c9bdf1074305..000000000000 > --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml > +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml > @@@ -21,11 -29,8 +29,12 @@@ properties > - items: > - enum: > - amlogic,meson-gxm-mali > + - realtek,rtd1295-mali > - const: arm,mali-t820 > + - items: > + - enum: > + - arm,juno-mali > + - const: arm,mali-t624 > - items: > - enum: > - rockchip,rk3288-mali > @@@ -34,16 -40,8 +44,7 @@@ > - enum: > - rockchip,rk3399-mali > - const: arm,mali-t860 > - - items: > - - enum: > - - samsung,exynos5250-mali > - - const: arm,mali-t604 > - - items: > - - enum: > - - samsung,exynos5433-mali > - - const: arm,mali-t760 > > - # "arm,mali-t628" > - # "arm,mali-t624" > # "arm,mali-t830" > # "arm,mali-t880" >
diff --cc Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml index 018f3ae4b43c,c9bdf1074305..000000000000 --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml between commit: 577dd5de0990 ("arm64: dts: juno: add GPU subsystem") from the arm-soc tree and commit: 3afd6389f320 ("dt-bindings: gpu: mali-midgard: add samsung exynos 5420 compatible") 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.