From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: 2.6.25-mm1: suspend-to-disk warning, resume failure Date: Sat, 19 Apr 2008 01:16:16 +0200 Message-ID: <200804190116.17095.rjw@sisk.pl> References: <200804182330.40530.rjw@sisk.pl> <20080418221606.GA1559@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20080418221606.GA1559@kroah.com> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: Greg KH Cc: Andrew Morton , USB list , linux-pm@lists.linux-foundation.org List-Id: linux-pm@vger.kernel.org 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 > > > > > > > > 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