swsusp: fix default and merge upstream?

swsusp: fix default and merge upstream?

[Pavel Machek]

Hi!

Perhaps now is the right time to merge -mm swsusp up to Linus? I'd
like new swsusp to default to powerdown mode (as it did before) before
it goes up (attached patch)... But if you want to test ACPI code paths
even in Linus tree, leave it out.

								Pavel

--- clean-mm/kernel/power/main.c	2004-08-17 12:21:44.000000000 +0200
+++ linux-mm/kernel/power/main.c	2004-08-17 12:22:47.000000000 +0200
@@ -33,8 +33,6 @@
 {
 	down(&pm_sem);
 	pm_ops = ops;
-	if (ops->pm_disk_mode && ops->pm_disk_mode < PM_DISK_MAX)
-		pm_disk_mode = ops->pm_disk_mode;
 	up(&pm_sem);
 }
 

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

Re: swsusp: fix default and merge upstream?

[Andrew Morton]

Pavel Machek <pavel@ucw.cz> wrote:
>
> Perhaps now is the right time to merge -mm swsusp up to Linus?

I suppose so.  The way to do that is for Pat to merge up the various
patches which are hanging around and then ask Linus to do the bk pull.

What's the testing status of the new code in bk-power.patch?

Re: swsusp: fix default and merge upstream?

[Pavel Machek]

Hi!

> > Perhaps now is the right time to merge -mm swsusp up to Linus?
> 
> I suppose so.  The way to do that is for Pat to merge up the various
> patches which are hanging around and then ask Linus to do the bk pull.

-mm plus two patches I sent today works pretty much okay. Are they
swsusp-related things in your tree that are not in patrick's bk?

driver-tree changes (enums etc) are pretty much orthogonal and can go
in anytime later.

> What's the testing status of the new code in bk-power.patch?

Works for me, some users reported success (after being advised to use
"shutdown" method), and suse pulled it into internal tree and it got
basic testing there by Stefan. I guess that counts like "pretty well
tested".

								Pavel
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

Re: swsusp: fix default and merge upstream?

[Andrew Morton]

Pavel Machek <pavel@suse.cz> wrote:
>
> Hi!
> 
> > > Perhaps now is the right time to merge -mm swsusp up to Linus?
> > 
> > I suppose so.  The way to do that is for Pat to merge up the various
> > patches which are hanging around and then ask Linus to do the bk pull.
> 
> -mm plus two patches I sent today works pretty much okay.

OK.

> Are they
> swsusp-related things in your tree that are not in patrick's bk?

Just a couple of patches:

mm-swsusp-make-sure-we-do-not-return-to-userspace-where-image-is-on-disk.patch
mm-swsusp-copy_page-is-harmfull.patch

> driver-tree changes (enums etc) are pretty much orthogonal and can go
> in anytime later.
> 
> > What's the testing status of the new code in bk-power.patch?
> 
> Works for me, some users reported success (after being advised to use
> "shutdown" method), and suse pulled it into internal tree and it got
> basic testing there by Stefan. I guess that counts like "pretty well
> tested".

OK.  I'll integrate your most recent patches and will squirt everything at
Patrick.

Re: swsusp: fix default and merge upstream?

[Pavel Machek]

Hi!

> > Are they
> > swsusp-related things in your tree that are not in patrick's bk?
> 
> Just a couple of patches:
> 
> mm-swsusp-make-sure-we-do-not-return-to-userspace-where-image-is-on-disk.patch
> mm-swsusp-copy_page-is-harmfull.patch
> 
> > driver-tree changes (enums etc) are pretty much orthogonal and can go
> > in anytime later.
> > 
> > > What's the testing status of the new code in bk-power.patch?
> > 
> > Works for me, some users reported success (after being advised to use
> > "shutdown" method), and suse pulled it into internal tree and it got
> > basic testing there by Stefan. I guess that counts like "pretty well
> > tested".
> 
> OK.  I'll integrate your most recent patches and will squirt everything at
> Patrick.

Thanks.
									Pavel	
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!