linux-next: manual merge of the amlogic tree with the arm-soc tree

linux-next: manual merge of the amlogic tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

between commit:

  f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")

from the arm-soc tree and commit:

  47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")

from the amlogic tree.

I fixed it up (the latter moved the code modified by the former into
another file, but also incorporated the change from the former) 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

linux-next: manual merge of the amlogic tree with the arm-soc tree

[Kevin Hilman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
>   arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
>
> between commit:
>
>   f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")
>
> from the arm-soc tree and commit:
>
>   47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")
>
> from the amlogic tree.

The latter has been dropped from the amlogic pending some ongoing
discussion, but I forgot to push an updated for-next. That's remedied
now.

Kevin

linux-next: manual merge of the amlogic tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1220 bytes --]

Hi all,

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

  MAINTAINERS

between commit:

  724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories")

from the arm-soc tree and commit:

  9e70e49474bb ("MAINTAINERS: add PHY-related files to Amlogic SoC file list")

from the amlogic 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 MAINTAINERS
index 7ad2bf6ac1af,9f769aa65936..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1912,7 -1915,8 +1912,8 @@@ L:	linux-arm-kernel@lists.infradead.or
  L:	linux-amlogic@lists.infradead.org
  S:	Maintained
  W:	http://linux-meson.com/
+ F:	Documentation/devicetree/bindings/phy/amlogic*
 -F:	arch/arm/boot/dts/meson*
 +F:	arch/arm/boot/dts/amlogic/
  F:	arch/arm/mach-meson/
  F:	arch/arm64/boot/dts/amlogic/
  F:	drivers/mmc/host/meson*

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

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: manual merge of the amlogic tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

between commit:

  8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")

from the arm-soc tree and commit:

  d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")

from the amlogic tree.

This patch was modified before being merged into the arm-soc tree.
Please clean up the amlogic tree.

I fixed it up (I used the arm-soc tree version) 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

linux-next: manual merge of the amlogic tree with the arm-soc tree

[Kevin Hilman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
>   arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>
> between commit:
>
>   8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
>   d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.

Cleaned up.

I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.

Kevin