Re: [GIT PULL 2/3] msm fixes for 3.11

From: Olof Johansson
Date: Mon Jun 17 2013 - 16:31:56 EST

On Mon, Jun 17, 2013 at 1:26 PM, David Brown <davidb@xxxxxxxxxxxxxx> wrote:
> 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.

Me neither. Hm. I wonder what I was looking at when I said that. Nevermind.

> 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?

Yes, just send a patch, not a pull request.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at