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

[Stephen Rothwell]

Hi Tejun,

On Thu, 24 Nov 2011 13:12:29 -0800 Tejun Heo <tj@xxxxxxxxxx> wrote:
>
> 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.

Thanks, I have updated my merge resolution.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature