From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [GIT PULL] ARM: OMAP: clock, powerdomain, clockdomain, hwmod fixes for early v3.4-rc Date: Thu, 5 Apr 2012 09:42:24 -0700 Message-ID: <20120405164223.GA3785@atomide.com> References: <20120405004139.GA10780@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:39282 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752087Ab2DEQm3 (ORCPT ); Thu, 5 Apr 2012 12:42:29 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Paul Walmsley [120405 01:53]: > On Wed, 4 Apr 2012, Paul Walmsley wrote: > > > On Wed, 4 Apr 2012, Tony Lindgren wrote: > > > > > Thanks, looks like two of these patches I already merged into > > > fixes yesterday from your earlier pull request. So merging this > > > in would cause duplicate commits. Can you please update your > > > branch to remove those two commits? > > > > Do you happen to recall which ones they are? > > Anyway, am guessing that you are planning to pull these into your > 'fixes' branch? If so then probably the conflicts are with the > misc_devel_3.4 branch patches. Will post another pull request for you > with those two patches dropped. But if you're pulling these into a > different branch, please let me know... Yes it's the fixes branch I was talking about, thanks for updating it. Tony From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Thu, 5 Apr 2012 09:42:24 -0700 Subject: [GIT PULL] ARM: OMAP: clock, powerdomain, clockdomain, hwmod fixes for early v3.4-rc In-Reply-To: References: <20120405004139.GA10780@atomide.com> Message-ID: <20120405164223.GA3785@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Paul Walmsley [120405 01:53]: > On Wed, 4 Apr 2012, Paul Walmsley wrote: > > > On Wed, 4 Apr 2012, Tony Lindgren wrote: > > > > > Thanks, looks like two of these patches I already merged into > > > fixes yesterday from your earlier pull request. So merging this > > > in would cause duplicate commits. Can you please update your > > > branch to remove those two commits? > > > > Do you happen to recall which ones they are? > > Anyway, am guessing that you are planning to pull these into your > 'fixes' branch? If so then probably the conflicts are with the > misc_devel_3.4 branch patches. Will post another pull request for you > with those two patches dropped. But if you're pulling these into a > different branch, please let me know... Yes it's the fixes branch I was talking about, thanks for updating it. Tony