Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1414542 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-06-06 02:00 +0200 |
| Last post | 2016-06-10 00:50 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the amlogic tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-06 02:00 +0200
Re: linux-next: build failure after merge of the amlogic tree Kevin Hilman <khilman@baylibre.com> - 2016-06-06 05:50 +0200
Re: linux-next: build failure after merge of the amlogic tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-06 06:10 +0200
Re: linux-next: build failure after merge of the amlogic tree Kevin Hilman <khilman@baylibre.com> - 2016-06-10 00:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-06 02:00 +0200 |
| Subject | linux-next: build failure after merge of the amlogic tree |
| Message-ID | <rGQ7v-4ZI-3@gated-at.bofh.it> |
Hi Kevin,
After merging the amlogic tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
Caused by commit
bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")
I guess a file was forgotten.
I have dorpped the amlogic tree for today.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Kevin Hilman <khilman@baylibre.com> |
|---|---|
| Date | 2016-06-06 05:50 +0200 |
| Message-ID | <rGTI5-7Qz-7@gated-at.bofh.it> |
| In reply to | #1414542 |
Hi Stephen,
On Sun, Jun 5, 2016 at 4:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kevin,
>
> After merging the amlogic tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
> In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
>
> Caused by commit
>
> bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")
>
> I guess a file was forgotten.
Not forgotten, but merged through Philip's reset tree, which I thought
was already in linux-next. Sorry about that.
Kevin
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-06 06:10 +0200 |
| Message-ID | <rGU1r-8cc-15@gated-at.bofh.it> |
| In reply to | #1414596 |
Hi Kevin, On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote: > > Not forgotten, but merged through Philip's reset tree, which I thought > was already in linux-next. Sorry about that. It may well be, but we dislike implicit dependencies between trees ... it makes the merge order matter :-( What you should have is a common non-rebasing branch that both trees merge. It also means that your for-next branch, on its own, will get this build failure as well ... -- Cheers, Stephen Rothwell
[toc] | [prev] | [next] | [standalone]
| From | Kevin Hilman <khilman@baylibre.com> |
|---|---|
| Date | 2016-06-10 00:50 +0200 |
| Message-ID | <rIgVY-4lJ-45@gated-at.bofh.it> |
| In reply to | #1414606 |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Kevin, > > On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote: >> >> Not forgotten, but merged through Philip's reset tree, which I thought >> was already in linux-next. Sorry about that. > > It may well be, but we dislike implicit dependencies between trees ... > it makes the merge order matter :-( What you should have is a common > non-rebasing branch that both trees merge. Yup, I'll work this out with Philipp. Kevin
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web