From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [PATCH 1/3] PM: Introduce new top level suspend and hibernation callbacks (rev. 7) Date: Fri, 11 Apr 2008 17:23:02 -0700 Message-ID: <20080412002302.GA27656@kroah.com> References: <200804040111.15255.rjw@sisk.pl> <200804040112.45769.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pentafluge.infradead.org ([213.146.154.40]:34345 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752695AbYDLW0k (ORCPT ); Sat, 12 Apr 2008 18:26:40 -0400 Content-Disposition: inline In-Reply-To: <200804040112.45769.rjw@sisk.pl> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: "Rafael J. Wysocki" Cc: pm list , ACPI Devel Maling List , Alan Stern , Len Brown , LKML , Alexey Starikovskiy , David Brownell , Pavel Machek , Benjamin Herrenschmidt , Oliver Neukum , Nigel Cunningham , Jesse Barnes On Fri, Apr 04, 2008 at 01:12:44AM +0200, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Introduce 'struct pm_ops' and 'struct pm_ext_ops' ('ext' meaning > 'extended') representing suspend and hibernation operations for bus > types, device classes, device types and device drivers. This is probably because I took a few days to merge this, but it doesn't apply to my tree anymore, with some wierd merge errors that I don't think I can easily resolve without having to totally guess as to what it should be (the apm_32.c area especially...) Care to respin these patches? Sorry for the delay. thanks, greg k-h