ACPI git trees and vacation
Subsystems (2)
Hi,
First I'll be on vacation next week. I'll not be completely offline, but all replies will be delayed and I won't do much work. It now looks like the merge window might open in that week, if yes I'll only merge the following week.
The trees for the next ACPI merge are at git.kernel.org now These are based on Len's branches with some additional patches.
(based on Linus' tree aka 2.6.26rc9)git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.git release Intended for the 2.6.27 merge
git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.git test
(based on Linux next for patches with dependencies)git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-next-acpi.git
This is not quite yet the full state intended for the merge, a few patches are still missing.
I would appreciate review and testing. They are currently not in linux-next.
-Andi
Hi Andi,
Quoted 7 lines · On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <[email protected]> wrote:
The trees for the next ACPI merge are at git.kernel.org now These are based on Len's branches with some additional patches.
(based on Linus' tree aka 2.6.26rc9)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.gitrelease Intended for the 2.6.27 merge
If that is true ..
Quoted 1 line
git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.gittest
Then why is linux-next tracking that?
Quoted 2 lines
(based on Linux next for patches with dependencies)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-next-acpi.git
Is there something we can do about those dependencies?
Quoted 2 lines
This is not quite yet the full state intended for the merge, a few patches are still missing.
So what is missing, and why should we merge stuff in 2.6.27 that we don't see until the merge window? (Not trying to be antagonistic, just asking about procedure and wondering why stuff for 2.6.27 is still not in linux-next.)
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Hi Andi,
Quoted 10 lines · On Mon, 7 Jul 2008 09:56:59 +1000 Stephen Rothwell <[email protected]> wrote:
Quoted 7 lines · On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <[email protected]> wrote:
The trees for the next ACPI merge are at git.kernel.org now These are based on Len's branches with some additional patches.
(based on Linus' tree aka 2.6.26rc9)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.gitrelease Intended for the 2.6.27 merge
Quoted 5 lines
If that is true ..
Quoted 1 line
git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.gittestThen why is linux-next tracking that?
So maybe I read that wrong. It appears that the release branch is already a subset Linus' tree and you meant that comment ("Intended for the 2.6.27 merge") was meant to apply to the test branch. Right?
Quoted 4 lines
Quoted 2 lines
(based on Linux next for patches with dependencies)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-next-acpi.gitIs there something we can do about those dependencies?
This is still a valid question as I have been trying to push trivial dependencies into Linus' tree ...
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 10 lines · Stephen Rothwell
Hi Andi,
Quoted 6 lines · On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <[email protected]> wrote:
The trees for the next ACPI merge are at git.kernel.org now These are based on Len's branches with some additional patches.
(based on Linus' tree aka 2.6.26rc9)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.gitrelease Intended for the 2.6.27 merge
Quoted 5 lines
If that is true ..
Quoted 1 line
git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.gittestThen why is linux-next tracking that?
It is tracking Len's tree not mine, right?
Right now my only has a few patches difference, but it will be growing.
Or did you switch already to mine?
Quoted 5 lines
Quoted 3 lines
(based on Linux next for patches with dependencies)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-next-acpi.gitIs there something we can do about those dependencies?
It's some patches from Henrique that require rfkill changes in the net tree. I'm also not happy about that (it complicates everything here), but cannot do much about it.
Quoted 7 lines
Quoted 2 lines
This is not quite yet the full state intended for the merge, a few patches are still missing.
So what is missing, and why should we merge stuff in 2.6.27 that we don't see until the merge window? (Not trying to be antagonistic, just asking about procedure and wondering why stuff for 2.6.27 is still not in linux-next.)
Because they're small fixes and would go in later anyways.
And because I haven't gone through all of them yet due to time reasons, but I cannot say categorically I'll delay them all.
-Andi
Hi Andi,
Quoted 11 lines · On Mon, 07 Jul 2008 08:17:31 +0200 Andi Kleen <[email protected]> wrote:
Quoted 9 lines · Stephen Rothwell
Quoted 6 lines · On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <[email protected]> wrote:
The trees for the next ACPI merge are at git.kernel.org now These are based on Len's branches with some additional patches.
(based on Linus' tree aka 2.6.26rc9)
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.gitrelease Intended for the 2.6.27 merge
Quoted 7 lines
Quoted 5 lines
If that is true ..
Quoted 1 line
git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.gittestThen why is linux-next tracking that?
It is tracking Len's tree not mine, right?
/me hits himself in the head :-)
Sorry about that.
Quoted 1 line
Or did you switch already to mine?
No, I only do what is asked of me :-)
Time I got my glasses replaced :-)
Quoted 5 lines
Quoted 1 line
Is there something we can do about those dependencies?
It's some patches from Henrique that require rfkill changes in the net tree. I'm also not happy about that (it complicates everything here), but cannot do much about it.
OK, yeah that is a pain.
Quoted 9 lines
Quoted 4 lines
So what is missing, and why should we merge stuff in 2.6.27 that we don't see until the merge window? (Not trying to be antagonistic, just asking about procedure and wondering why stuff for 2.6.27 is still not in linux-next.)
Because they're small fixes and would go in later anyways.
And because I haven't gone through all of them yet due to time reasons, but I cannot say categorically I'll delay them all.
OK. This is all not so relevant since I misread above.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/