All of lore.kernel.org
 help / color / mirror / Atom feed
* cpuidle
@ 2007-09-24  0:57 Andrew Morton
  2007-09-24  2:28 ` cpuidle Len Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2007-09-24  0:57 UTC (permalink / raw)
  To: Len Brown; +Cc: linux-acpi, Thomas Gleixner


Whaaaaa?  Seems that the cpuidle patches all got dropped, but the x86_64
dynticks patches were fairly heavily dependent upon them.  (iow: I'm
screwed).

I can go back to the old version of git-acpi and retain the dynticks
patches or I can drop the dynticks patches.  (Either way I remain screwed).

What's happening?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: cpuidle
  2007-09-24  0:57 cpuidle Andrew Morton
@ 2007-09-24  2:28 ` Len Brown
  2007-09-24  2:39   ` cpuidle Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Len Brown @ 2007-09-24  2:28 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-acpi, Thomas Gleixner, Pallipadi, Venki

On Sunday 23 September 2007 20:57, Andrew Morton wrote:
> 
> Whaaaaa?  Seems that the cpuidle patches all got dropped, but the x86_64
> dynticks patches were fairly heavily dependent upon them.  (iow: I'm
> screwed).
> 
> I can go back to the old version of git-acpi and retain the dynticks
> patches or I can drop the dynticks patches.  (Either way I remain screwed).
> 
> What's happening?

Yes, I dropped cpuidle on Friday with plans to re-merge it Monday.

The reason is because I re-wrote my test tree Friday in prep for 2.6.24.
As cpuidle had been merged multiple times, I needed to re-merge it and
deal with the conflicts, and I ran out of time.

What we should end up with on Monday is a single cpuidle patch
that sits on top of 2.6.22, and a single patch that merges it up to 2.6.23.

sorry for the disruption,
-Len

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: cpuidle
  2007-09-24  2:28 ` cpuidle Len Brown
@ 2007-09-24  2:39   ` Andrew Morton
  2007-09-24  3:12     ` cpuidle Len Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2007-09-24  2:39 UTC (permalink / raw)
  To: Len Brown; +Cc: linux-acpi, Thomas Gleixner, Pallipadi, Venki

On Sun, 23 Sep 2007 22:28:30 -0400 Len Brown <lenb@kernel.org> wrote:

> On Sunday 23 September 2007 20:57, Andrew Morton wrote:
> > 
> > Whaaaaa?  Seems that the cpuidle patches all got dropped, but the x86_64
> > dynticks patches were fairly heavily dependent upon them.  (iow: I'm
> > screwed).
> > 
> > I can go back to the old version of git-acpi and retain the dynticks
> > patches or I can drop the dynticks patches.  (Either way I remain screwed).
> > 
> > What's happening?
> 
> Yes, I dropped cpuidle on Friday with plans to re-merge it Monday.
> 
> The reason is because I re-wrote my test tree Friday in prep for 2.6.24.
> As cpuidle had been merged multiple times, I needed to re-merge it and
> deal with the conflicts, and I ran out of time.
> 
> What we should end up with on Monday is a single cpuidle patch
> that sits on top of 2.6.22, and a single patch that merges it up to 2.6.23.
> 

I really don't know what I did, but for some reason the patches all
applied after I fiddled with something.  Maybe I broke something, dunno.

I did drop a few acpi patches which were dependent upon cpuidle:

-acpi-suspend-consolidate-handling-of-sx-states.patch
-acpi-suspend-consolidate-handling-of-sx-states-addendum.patch

but they were staged _after_ the dynticks patches so I dunno what's going
on.  I guess when I try to compile this lot I'll have a better idea...

ho hum.  I hope I haven't lost any patches during this little episode.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: cpuidle
  2007-09-24  2:39   ` cpuidle Andrew Morton
@ 2007-09-24  3:12     ` Len Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Len Brown @ 2007-09-24  3:12 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-acpi, Thomas Gleixner, Pallipadi, Venki


> -acpi-suspend-consolidate-handling-of-sx-states.patch
> -acpi-suspend-consolidate-handling-of-sx-states-addendum.patch

Those two went to Linus Saturday morning.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-09-24  3:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-24  0:57 cpuidle Andrew Morton
2007-09-24  2:28 ` cpuidle Len Brown
2007-09-24  2:39   ` cpuidle Andrew Morton
2007-09-24  3:12     ` cpuidle Len Brown

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.