> -----Original Message----- > From: Kevin Hilman [mailto:khilman@xxxxxx] > Sent: Friday, March 25, 2011 8:54 PM > To: Santosh Shilimkar > Cc: linux-omap@xxxxxxxxxxxxxxx; Rajendra Nayak; linux-arm- > kernel@xxxxxxxxxxxxxxxxxxx > Subject: Re: [PATCH v2 00/19] OMAP4: PM: Suspend, CPU-hotplug and > CPUilde support. > > Hi Santosh, > > Santosh Shilimkar <santosh.shilimkar@xxxxxx> writes: [....] > > I pulled your latest pm-core branch > > ------ > > commit 61cbb3172176b84c106bf0f4c32317c472932ab5 > > Merge: d0cf394... da19719... > > Author: Kevin Hilman <khilman@xxxxxx> > > Date: Wed Mar 23 16:33:01 2011 -0700 > > > > Merge branch 'for_2.6.40/pm-misc' into pm-reset > > ----------------- > > Looks like Russell's devel branch isn't merged in pm-core. > > I didn't find the relevant patches. > > hmm, you're right. I'm actually pulling Russell's devel-stable > branch > not his devel branch. I assumed they were in devel-stable as well. > Ok. > > By the way the relevant ARM patches are already in mainline. > > So if the pm-core is rebased against latest mainline, we can get > > those changes as well. > > Before I rebase, I'll wait at least until -rc1 and/or Tony rebases > to mainline. > Ok. > In the mean time, can you create two branches? One with the > dependencies and another with the OMAP4 PM series. After some final > review and testing, I'll merge the latter series and by then we'll > probably have an -rc1 baseline. > Will do. Regards, Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
