Re: swsusp: fix default and merge upstream?

Andrew Morton
2004-08-17T18:30:36Z

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.