Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1561072 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the amlogic tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-18 00:00 +0100
    Re: linux-next: manual merge of the amlogic tree with the arm-soc tree Kevin Hilman <khilman@baylibre.com> - 2017-01-18 20:20 +0100

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

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

[toc] | [next] | [standalone]

#1562088

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web