From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335Ab3FQUbw (ORCPT ); Mon, 17 Jun 2013 16:31:52 -0400 Received: from mail-qc0-f172.google.com ([209.85.216.172]:65203 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752397Ab3FQUbt (ORCPT ); Mon, 17 Jun 2013 16:31:49 -0400 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:6e3b:e5ff:fe16:f1aa] In-Reply-To: <20130617202624.GA23915@codeaurora.org> References: <1371232615-30731-1-git-send-email-davidb@codeaurora.org> <1371232615-30731-4-git-send-email-davidb@codeaurora.org> <20130615012617.GU18124@quad.lixom.net> <20130617202624.GA23915@codeaurora.org> Date: Mon, 17 Jun 2013 13:31:49 -0700 Message-ID: Subject: Re: [GIT PULL 2/3] msm fixes for 3.11 From: Olof Johansson To: David Brown Cc: "arm@kernel.org" , Arnd Bergmann , Nicolas Pitre , Thomas Gleixner , Russell King , linux-arm-msm@vger.kernel.org, "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 17, 2013 at 1:26 PM, David Brown 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