Arnd Bergmann [off-list ref] writes:
On Thursday 06 October 2011, Tony Lindgren wrote:
quoted
* Rob Herring [off-list ref] [111001 13:21]:
quoted
On 09/30/2011 05:29 PM, Kevin Hilman wrote:
quoted
Hi Arnd,
Kevin Hilman [off-list ref] writes:
quoted
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
On Friday 07 October 2011, Kevin Hilman wrote:
quoted
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
On Fri, 7 Oct 2011, Arnd Bergmann wrote:
On Friday 07 October 2011, Kevin Hilman wrote:
quoted
quoted
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.
For your internal dependecies, yes. But for irq/core you don't have to
wait. You just need to tell Linus in the pull request that you pulled
my branch with my ack as it contains modifications which are
prerequisite for arm/whatever.
When I send my pull request later, then this wont do any damage as
Linus has the commits already. Same the other way round. We do that
all the time, otherwise pull dependencies would be a nightmare.
Thanks,
tglx
On Friday 07 October 2011, Thomas Gleixner wrote:
For your internal dependecies, yes. But for irq/core you don't have to
wait. You just need to tell Linus in the pull request that you pulled
my branch with my ack as it contains modifications which are
prerequisite for arm/whatever.
When I send my pull request later, then this wont do any damage as
Linus has the commits already. Same the other way round. We do that
all the time, otherwise pull dependencies would be a nightmare.
Ok, makes sense.
Thanks,
Arnd