Re: 2.6.25-mm1: suspend-to-disk warning, resume failure

Rafael J. Wysocki
2008-04-18T23:16:16Z

On Saturday, 19 of April 2008, Greg KH wrote:
> On Fri, Apr 18, 2008 at 11:30:39PM +0200, Rafael J. Wysocki wrote:
> > On Friday, 18 of April 2008, Greg KH wrote:
> > > > ---
> > > > From: Rafael J. Wysocki <rjw@sisk.pl>
> > > >
> > > > Make hibernation work as documented in include/linux/pm.h .
> > > >
> > > > In pm.h it is documented that device_power_up() and device_resume()
> > > > will be called with PMSG_RECOVER if the creation of a hibernation
> > > > image fails or the restoration of memory contents from a
> > > > hibernation image fails. Otherwise, it should be called either
> > > > with PMSG_THAW or with PMSG_RESTORE, depending on the context.
> > > > Make that happen.
> > >
> > > Should either of these patches be merged / added to the ones you sent me
> > > before?
> >
> > Yes, both of them, please.
>
> Ok, which is it? Added at the end of the series, or merged in to
> prevent git bisection problems? If merged, which patch should I merge
> it to?

Please merge both into
pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch ,
if possible, the changes belong in there.

Thanks,
Rafael