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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAOesGMhthDb3rsm=GyAy=4F=mNYukYt70BpeS7fwBORkhAJ8sA@mail.gmail.com>
Date:	Mon, 17 Jun 2013 13:31:49 -0700
From:	Olof Johansson <olof@...om.net>
To:	David Brown <davidb@...eaurora.org>
Cc:	"arm@...nel.org" <arm@...nel.org>, Arnd Bergmann <arnd@...db.de>,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Russell King <rmk@....linux.org.uk>,
	linux-arm-msm@...r.kernel.org,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL 2/3] msm fixes for 3.11

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


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/