Re: linux-next: manual merge of the cgroup tree with the pm tree

[Tejun Heo]

Hello,

On Wed, Nov 23, 2011 at 8:20 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the cgroup tree got a conflict in
> kernel/cgroup_freezer.c between commit 6907483b4e80 ("freezer: make
> freezing indicate freeze condition in effect") from the pm tree and
> commit 41dfa07cedcc ("cgroup_freezer: fix freezing groups with stopped
> tasks") from the cgroup tree.
>
> I think that the latter is a superset of the former (but I may be wrong),
> so I used that.

We'll need to do freezing() || is_task_frozen_enough() there. I'll
update pm-freezer after I push cgroup fix upstream next week.

Thank you.

-- 
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/