Re: [GIT PULL pm-next] freezer: fix various bugs and simplifyimplementation

From: Tejun Heo
Date: Sun Aug 21 2011 - 05:12:15 EST


Hello, Rafafel.

On Sat, Aug 20, 2011 at 06:33:38PM +0200, Rafael J. Wysocki wrote:
> > ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc.git freezer
>
> Pulled and stored in the pm-freezer branch in my tree, and merged into
> the linux-next branch.

Cool.

> > FYI, this patchset will cause a conflict with s390 TIF flag fix patch.
> > The conflict is trivial and Stephen should be able to handle it
> > without any problem. Also, I'm planning on doing some further work on
> > cgroup freezer and then will try to bridge it with job control. If
> > that plan fans out, I might ask Oleg to pull from the pm tree.
>
> I'm not sure if Linus likes it. He generally doesn't want the trees
> that he pulls from to be entangled this way.

The job control portion has to go through Linus anyway, so let's see
how that flies.

> > This shouldn't matter too much either way but it *might* be a good idea to
> > keep this line of patches in a separate branch.
>
> I'm going to keep it in the pm-freezer branch anyway (there may be patches
> on top of it, though)

Yeah, I'm pretty sure it will need some fix too.

Thanks.

--
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/