Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1562088
| From | Kevin Hilman <khilman@baylibre.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the amlogic tree with the arm-soc tree |
| Date | 2017-01-18 20:20 +0100 |
| Message-ID | <t13W2-83l-35@gated-at.bofh.it> (permalink) |
| References | <t0KTo-4vR-1@gated-at.bofh.it> |
| Organization | BayLibre |
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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
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
csiph-web