From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/3] DaVinci dts updates for v4.9
Date: Thu, 15 Sep 2016 11:35:14 +0200 [thread overview]
Message-ID: <5560037.rRSHMQTY3J@wuerfel> (raw)
In-Reply-To: <211a1af8-d76b-62af-08ac-a374d3285c0a@ti.com>
On Thursday, September 15, 2016 2:11:03 PM CEST Sekhar Nori wrote:
> On Wednesday 14 September 2016 09:23 PM, Arnd Bergmann wrote:
> > On Wednesday, August 24, 2016 4:30:05 PM CEST Sekhar Nori wrote:
> > Can you send a fixed version please?
>
> Did the merge happen cleanly? There should be no nand_cs3_pins if the
> merge was clean. It should be removed with 31e3a8817b66 ("ARM: dts:
> da850,da850-evm: Add an aemif node and use it for the NAND").
>
> If the merge was clean, can you please push the offending tree to some
> place I can fetch and take a look. I dont have "nand_cs3_pins" in my
> tree anymore nor I can reproduce the build break.
>
>
I must have made a mistake, it now all works, sorry for the confusion.
I don't have the error in my scrollback buffer any more, but I suspect
that the file that caused the problem was not actually the .dts file
but the .dts.orig file from resolving the conflict.
Pulled it into next/dt now.
Arnd
next prev parent reply other threads:[~2016-09-15 9:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-24 11:00 [GIT PULL 1/3] DaVinci soc support updates for v4.9 Sekhar Nori
2016-08-24 11:00 ` [GIT PULL 2/3] DaVinci dts " Sekhar Nori
2016-09-14 15:53 ` Arnd Bergmann
2016-09-15 8:41 ` Sekhar Nori
2016-09-15 9:35 ` Arnd Bergmann [this message]
2016-08-24 11:00 ` [GIT PULL 3/3] DaVinci defconfig " Sekhar Nori
2016-09-02 15:45 ` Arnd Bergmann
2016-09-02 16:21 ` [GIT PULL 1/3] DaVinci soc support " Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5560037.rRSHMQTY3J@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).