From: David Brown <davidb@codeaurora.org>
To: Olof Johansson <olof@lixom.net>
Cc: arm@kernel.org, Arnd Bergmann <arnd@arndb.de>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Russell King <rmk@arm.linux.org.uk>,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL 2/3] msm fixes for 3.11
Date: Mon, 17 Jun 2013 13:26:24 -0700 [thread overview]
Message-ID: <20130617202624.GA23915@codeaurora.org> (raw)
In-Reply-To: <20130615012617.GU18124@quad.lixom.net>
On Fri, Jun 14, 2013 at 06:26:17PM -0700, Olof Johansson wrote:
>> Stephen Boyd (3):
>> ARM: dts: msm: Fix bad register addresses
>
>Hmm. I see that the msm-hsuart device nodes completely lack reg entries. That's
>considerably more important to fix than the cosmetic unit address that's not
>even needed unless two nodes happen to have the same name.
I'm not seeing the missing reg entries in anyone's tree.
However, it appears that both of us resolved the merge conflict
differently, and both did it incorrectly.
How would you like this to be fixed? Should I just send you a patch
based off of the current soc tree?
Thanks,
David
--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-17 20:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-14 17:56 [GIT PULL 0/3] msm changes for 3.11 David Brown
2013-06-14 17:56 ` [GIT PULL 1/3] msm cleanups " David Brown
2013-06-15 1:21 ` Olof Johansson
2013-06-14 17:56 ` [GIT PULL 2/3] msm fixes " David Brown
2013-06-14 17:56 ` David Brown
2013-06-15 1:26 ` Olof Johansson
2013-06-17 20:26 ` David Brown [this message]
2013-06-17 20:31 ` Olof Johansson
2013-06-14 19:52 ` [GIT PULL 3/3] msm clock " David Brown
2013-06-15 1:35 ` Olof Johansson
2013-06-17 17:18 ` Stephen Boyd
2013-06-17 17:35 ` Olof Johansson
2013-06-24 21:00 ` [GIT PULL v2] " David Brown
2013-06-24 21:02 ` Chris Ball
2013-06-28 0:06 ` Olof Johansson
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=20130617202624.GA23915@codeaurora.org \
--to=davidb@codeaurora.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=olof@lixom.net \
--cc=rmk@arm.linux.org.uk \
--cc=tglx@linutronix.de \
/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).