ARM SoC tree: OMAP PM dependency on tip irq/core
Arnd,
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?
Thanks,
Kevin
[1] http://marc.info/?l=linux-omap&m=131684489920440&w=2
[2] http://marc.info/?l=linux-omap&m=131581416908252&w=2
[3] currently here: git://tesla.tglx.de/git/linux-2.6-tip
Hi Arnd,
Quoted 9 lines · Kevin Hilman
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.
You (or Tony) can then pull this one instead of manually managing the dependencies.
Kevin
Quoted 11 lines · Kevin Hilman
Hi Arnd,
Quoted 7 lines · Kevin Hilman
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.
Quoted 8 lines
Quoted 2 lines
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.
Rob
Quoted 19 lines · On Saturday 01 October 2011 15:55:05 Rob Herring wrote:
Quoted 10 lines
Quoted 7 lines · Kevin Hilman
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.
Quoted 8 lines
Quoted 2 lines
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.
Quoted 3 lines
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.
Good point. Also, I think in general it's better if I try to keep track of the depencies myself, so I don't accidentally submit patches upstream that belong into someone else's realm.
I haven't come up with a good scheme for that yet. Right now I just add a depends/* branch and try to remember which branches depend on that. If it gets harder than this, I'll have to write it down somewhere, but it would be nice to have some tool that can automatically warn if I try to submit something that has an unfulfilled dependency.
Arnd
Quoted 21 lines · Rob Herring
Quoted 11 lines · Kevin Hilman
Hi Arnd,
Quoted 7 lines · Kevin Hilman
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.
Quoted 8 lines
Quoted 2 lines
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.
Quoted 3 lines
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.
Tony
Quoted 22 lines · Tony Lindgren
Quoted 21 lines · Rob Herring
Quoted 19 lines · Kevin Hilman
Hi Arnd,
Quoted 9 lines · Kevin Hilman
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.
Quoted 5 lines
Quoted 3 lines
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?
Arnd
Quoted 27 lines · Arnd Bergmann
Quoted 26 lines · Tony Lindgren
Quoted 24 lines · Rob Herring
Quoted 11 lines · Kevin Hilman
Hi Arnd,
Quoted 7 lines · Kevin Hilman
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.
Quoted 8 lines
Quoted 2 lines
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.
Quoted 8 lines
Quoted 1 line
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
Quoted 11 lines · Kevin Hilman
Quoted 6 lines
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-tipirq/coreI 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
Quoted 15 lines · Arnd Bergmann
Quoted 11 lines · Kevin Hilman
Quoted 6 lines
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-tipirq/coreI 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.
Quoted 8 lines
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
Quoted 8 lines · Thomas Gleixner
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