Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1487642
| 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 | 2016-09-20 23:10 +0200 |
| Message-ID | <sjAsG-8jJ-15@gated-at.bofh.it> (permalink) |
| References | <sjgWZ-4au-15@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-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
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> - 2016-09-20 02:20 +0200 Re: linux-next: manual merge of the amlogic tree with the arm-soc tree Kevin Hilman <khilman@baylibre.com> - 2016-09-20 23:10 +0200
csiph-web