On Thursday, 5 of June 2008, Jesse Barnes wrote: > On Thursday, June 05, 2008 2:26 pm Jesse Barnes wrote: > > On Thursday, June 05, 2008 6:21 am Rafael J. Wysocki wrote: > > > On Thursday, 5 of June 2008, Len Brown wrote: > > > > Rafael, > > > > > > Hi, > > > > > > > this one no longer applies to linus' tree. > > > > > > No, it doesn't, because it depends on some patches in the PCI tree. > > > > > > > the previous 3 are on the suspend branch. > > > > > > Ah, I didn't know, sorry. > > > > Ah I didn't see this... So how do you want to handle it, Len? I've > > already got some of the previous stuff in my linux-next branch, so I could > > take these if you think they're ready. > > > > Alternately, you could pull the changes from my linux-next branch into your > > suspend tree. As long as neither of us rebase, that should be ok since > > things will merge up nicely when Linus pulls from either of us. > > Err, should have said cherry-pick here (in particular commits > 8d226439ef99b29fc41854f7c6fc63270bde6a00, > ce6b6443eda1e42383512ef146fd40899306682d and > 4ba09608f82f2273b731560f702f8bbb167f4c23). Either way, let me know so I know > whether I can rebase later on... I think you only need 34b4dcd9515e6dd248280181e56c2d520a5bef90 from the Len's suspend branch which [4/4] depends on. The other patches are not related. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
