All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Hilman <khilman@ti.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>,
	Rob Herring <robherring2@gmail.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-omap <linux-omap@vger.kernel.org>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: ARM SoC tree: OMAP PM dependency on tip irq/core
Date: Fri, 07 Oct 2011 10:50:26 -0700	[thread overview]
Message-ID: <87d3e8lmhp.fsf@ti.com> (raw)
In-Reply-To: <201110071804.11494.arnd@arndb.de> (Arnd Bergmann's message of "Fri, 7 Oct 2011 18:04:11 +0200")

Arnd Bergmann <arnd@arndb.de> writes:

> On Thursday 06 October 2011, Tony Lindgren wrote:
>> * Rob Herring <robherring2@gmail.com> [111001 13:21]:
>> > On 09/30/2011 05:29 PM, Kevin Hilman wrote:
>> > > Hi Arnd,
>> > > 
>> > > Kevin Hilman <khilman@ti.com> 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

WARNING: multiple messages have this Message-ID (diff)
From: khilman@ti.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: ARM SoC tree: OMAP PM dependency on tip irq/core
Date: Fri, 07 Oct 2011 10:50:26 -0700	[thread overview]
Message-ID: <87d3e8lmhp.fsf@ti.com> (raw)
In-Reply-To: <201110071804.11494.arnd@arndb.de> (Arnd Bergmann's message of "Fri, 7 Oct 2011 18:04:11 +0200")

Arnd Bergmann <arnd@arndb.de> writes:

> On Thursday 06 October 2011, Tony Lindgren wrote:
>> * Rob Herring <robherring2@gmail.com> [111001 13:21]:
>> > On 09/30/2011 05:29 PM, Kevin Hilman wrote:
>> > > Hi Arnd,
>> > > 
>> > > Kevin Hilman <khilman@ti.com> 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

  reply	other threads:[~2011-10-07 17:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-30 13:57 ARM SoC tree: OMAP PM dependency on tip irq/core Kevin Hilman
2011-09-30 13:57 ` Kevin Hilman
2011-09-30 22:29 ` Kevin Hilman
2011-09-30 22:29   ` Kevin Hilman
2011-10-01 20:55   ` Rob Herring
2011-10-01 20:55     ` Rob Herring
2011-10-02  7:03     ` Arnd Bergmann
2011-10-02  7:03       ` Arnd Bergmann
2011-10-06 19:59     ` Tony Lindgren
2011-10-06 19:59       ` Tony Lindgren
2011-10-07 16:04       ` Arnd Bergmann
2011-10-07 16:04         ` Arnd Bergmann
2011-10-07 17:50         ` Kevin Hilman [this message]
2011-10-07 17:50           ` Kevin Hilman
2011-10-07 18:53           ` Arnd Bergmann
2011-10-07 18:53             ` Arnd Bergmann
2011-10-07 18:59             ` Thomas Gleixner
2011-10-07 18:59               ` Thomas Gleixner
2011-10-07 20:14               ` Arnd Bergmann
2011-10-07 20:14                 ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87d3e8lmhp.fsf@ti.com \
    --to=khilman@ti.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=robherring2@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.