From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: ARM SoC tree: OMAP PM dependency on tip irq/core Date: Fri, 07 Oct 2011 10:50:26 -0700 Message-ID: <87d3e8lmhp.fsf@ti.com> References: <87aa9mm8ts.fsf@ti.com> <4E877E29.7000309@gmail.com> <20111006195945.GQ6324@atomide.com> <201110071804.11494.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from na3sys009aog123.obsmtp.com ([74.125.149.149]:33876 "EHLO na3sys009aog123.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753540Ab1JGRub (ORCPT ); Fri, 7 Oct 2011 13:50:31 -0400 Received: by mail-yw0-f49.google.com with SMTP id 9so4758918ywf.36 for ; Fri, 07 Oct 2011 10:50:30 -0700 (PDT) In-Reply-To: <201110071804.11494.arnd@arndb.de> (Arnd Bergmann's message of "Fri, 7 Oct 2011 18:04:11 +0200") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Arnd Bergmann Cc: Tony Lindgren , Rob Herring , Thomas Gleixner , linux-omap , linux-arm-kernel Arnd Bergmann writes: > On Thursday 06 October 2011, Tony Lindgren wrote: >> * Rob Herring [111001 13:21]: >> > On 09/30/2011 05:29 PM, Kevin Hilman wrote: >> > > Hi Arnd, >> > > >> > > Kevin Hilman writes: >> > > >> > >> The upcoming OMAP4 PM series from Santosh[1] that we're planning to >> > >> queue for v3.2 has a dependency[2] on a patch currently queued for v3.2 >> > >> in the irq/core branch of Thomas' tip tree[3]. >> > >> >> > >> In the past, I noticed you merged external trees like this to solve >> > >> dependencies. >> > >> >> > >> Could you pull the irq/core branch into your tree to meet this >> > >> dependency? >> > > >> > > On second thought, since Santosh's branch is the only one with this >> > > dependency (and we also have a dependency on Russell's devel-stable) >> > > I'll just build up a branch for Santosh's series that includes >> > > rmk/devel-stable and tglx/irq-core. >> > > >> > >> > Any new platforms will have a dependency on rmk/devel-stable with the >> > mach header clean-up. I'll probably have a dependency on tglx's tree as >> > well. >> >> Sounds like Arnd should pull this into some branch then. > > I've pulled in rmk/devel-stable as a dependency now, thanks for > reminding me of that. > > Thomas, where should I get the irq-core branch (or whichever > I should wait for) to pull in as another dependency. Is that > branch one that never gets rebased? git://tesla.tglx.de/git/linux-2.6-tip irq/core I asked Thomas about this earlier when I was going to build up the dependencies myself, and he said it won't be rebased. Kevin