ACPI git trees and vacation

ACPI git trees and vacation

[Andi Kleen]

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

Re: ACPI git trees and vacation

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

Hi Andi,

On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <andi@firstfloor.org> 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.git release
> Intended for the 2.6.27 merge

If that is true ..

> git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.git test

Then why is linux-next tracking that?

> (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?

> 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.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: ACPI git trees and vacation

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

Hi Andi,

On Mon, 7 Jul 2008 09:56:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <andi@firstfloor.org> 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.git release
> > Intended for the 2.6.27 merge
> 
> If that is true ..
> 
> > git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.git test
> 
> Then 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?

> > (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?

This is still a valid question as I have been trying to push trivial
dependencies into Linus' tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: ACPI git trees and vacation

[Andi Kleen]

Stephen Rothwell wrote:
> Hi Andi,
> 
> On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <andi@firstfloor.org> 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.git release
>> Intended for the 2.6.27 merge
> 
> If that is true ..
> 
>> git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.git test
> 
> Then 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?

> 
>> (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?

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.

>> 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

Re: ACPI git trees and vacation

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1788 bytes --]

Hi Andi,

On Mon, 07 Jul 2008 08:17:31 +0200 Andi Kleen <andi@firstfloor.org> wrote:
>
> Stephen Rothwell wrote:
> > 
> > On Sun, 06 Jul 2008 20:48:49 +0200 Andi Kleen <andi@firstfloor.org> 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.git release
> >> Intended for the 2.6.27 merge
> > 
> > If that is true ..
> > 
> >> git://git.kernel.org/pub/scm/git/linux/kernel/ak/linux-acpi-2.6.git test
> > 
> > Then why is linux-next tracking that?
> 
> It is tracking Len's tree not mine, right?

/me hits himself in the head :-)

Sorry about that.

> Or did you switch already to mine?

No, I only do what is asked of me :-)

Time I got my glasses replaced :-)

> > 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.

> > 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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]