From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7 Date: Fri, 21 Sep 2012 17:21:11 -0700 Message-ID: <20120922002111.GP28835@atomide.com> References: <20120921205322.GK28835@atomide.com> <20120921231039.GN28835@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:22685 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754506Ab2IVAVN (ORCPT ); Fri, 21 Sep 2012 20:21:13 -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 [120921 17:04]: > On Fri, 21 Sep 2012, Tony Lindgren wrote: > > > I tried merging this into tmp-merge, but ran into all kinds of > > merge conflicts with the am33xx code etc and ended up with a > > result that booted with all kinds of warnings on 2430sdp and > > did not boot at all on zoom3 :) So I probably did something > > wrong.. > > > > Care to base this on something more mergeable? > > Just let me know what you want me to base it on. > > > Maybe a merge of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7? > > The series rebases cleanly onto cleanup-fixes-for-v3.7 + > omap-devel-am33xx-for-v3.7, so I guess you'll probably want me to base it > somewhere else? Hmm I wonder what's causing it then? There must be something else in tmp-merge at commit abfee61f that causes the problems. Maybe try to merge with that commit and see what you get? That commit can't be used as a base though as that's temporary most likely.. But we can create a base to use out of the branches once we know them, you can do it yourself too. Regards, Tony From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Fri, 21 Sep 2012 17:21:11 -0700 Subject: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7 In-Reply-To: References: <20120921205322.GK28835@atomide.com> <20120921231039.GN28835@atomide.com> Message-ID: <20120922002111.GP28835@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Paul Walmsley [120921 17:04]: > On Fri, 21 Sep 2012, Tony Lindgren wrote: > > > I tried merging this into tmp-merge, but ran into all kinds of > > merge conflicts with the am33xx code etc and ended up with a > > result that booted with all kinds of warnings on 2430sdp and > > did not boot at all on zoom3 :) So I probably did something > > wrong.. > > > > Care to base this on something more mergeable? > > Just let me know what you want me to base it on. > > > Maybe a merge of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7? > > The series rebases cleanly onto cleanup-fixes-for-v3.7 + > omap-devel-am33xx-for-v3.7, so I guess you'll probably want me to base it > somewhere else? Hmm I wonder what's causing it then? There must be something else in tmp-merge at commit abfee61f that causes the problems. Maybe try to merge with that commit and see what you get? That commit can't be used as a base though as that's temporary most likely.. But we can create a base to use out of the branches once we know them, you can do it yourself too. Regards, Tony