From: Arnd Bergmann <arnd@arndb.de>
To: Kevin Hilman <khilman@ti.com>
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, 7 Oct 2011 20:53:41 +0200 [thread overview]
Message-ID: <201110072053.41594.arnd@arndb.de> (raw)
In-Reply-To: <87d3e8lmhp.fsf@ti.com>
On Friday 07 October 2011, Kevin Hilman wrote:
> > 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.
Ok, thanks for the info.
I think I've now also come up with a workflow for tracking the dependencies:
I have a depends/xxx branch for each other branch that I need to wait for
getting merged first. When I want to send a pull request, I first check
all the depends/* branches using 'git branch --merged next/xxx |
grep depends' to see what the dependencies are, and 'git branch --merged
torvalds/master | grep depends' to see if they are already merged upstream.
When a dependency is already merged, I can remove its tracking branch
from the arm-soc tree.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: ARM SoC tree: OMAP PM dependency on tip irq/core
Date: Fri, 7 Oct 2011 20:53:41 +0200 [thread overview]
Message-ID: <201110072053.41594.arnd@arndb.de> (raw)
In-Reply-To: <87d3e8lmhp.fsf@ti.com>
On Friday 07 October 2011, Kevin Hilman wrote:
> > 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.
Ok, thanks for the info.
I think I've now also come up with a workflow for tracking the dependencies:
I have a depends/xxx branch for each other branch that I need to wait for
getting merged first. When I want to send a pull request, I first check
all the depends/* branches using 'git branch --merged next/xxx |
grep depends' to see what the dependencies are, and 'git branch --merged
torvalds/master | grep depends' to see if they are already merged upstream.
When a dependency is already merged, I can remove its tracking branch
from the arm-soc tree.
Arnd
next prev parent reply other threads:[~2011-10-07 18:53 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
2011-10-07 17:50 ` Kevin Hilman
2011-10-07 18:53 ` Arnd Bergmann [this message]
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=201110072053.41594.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=khilman@ti.com \
--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.