From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Brown Subject: Re: [GIT PULL 2/3] msm fixes for 3.11 Date: Mon, 17 Jun 2013 13:26:24 -0700 Message-ID: <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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Return-path: Received: from smtp.codeaurora.org ([198.145.11.231]:53617 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751453Ab3FQU00 (ORCPT ); Mon, 17 Jun 2013 16:26:26 -0400 Content-Disposition: inline In-Reply-To: <20130615012617.GU18124@quad.lixom.net> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Olof Johansson 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 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