On Saturday, 12 of April 2008, Greg KH wrote: > On Fri, Apr 04, 2008 at 01:12:44AM +0200, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rjw@xxxxxxx> > > > > 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. > > <snip> > > 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? Sure, they'll go in replies to this message. They include a couple of fixes from Andrew that are in -mm. I have tested them on top of the current linux-next with pm-remove-destroy_suspended_device.patch, so they should apply to your tree this time. > Sorry for the delay. No big deal. Thanks, Rafael _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm