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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

Hi Tejun,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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@canb.auug.org.au> 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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

Hi Tejun,

On Thu, 24 Nov 2011 13:12:29 -0800 Tejun Heo <tj@kernel.org> wrote:
>
> On Wed, Nov 23, 2011 at 8:20 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in
kernel/cgroup_freezer.c between commit 22b4e111fa01 ("cgroup_freezer:
prepare for removal of TIF_FREEZE") from the pm tree and commit
cfb5ec210751 ("cgroup: don't use subsys->can_attach_task() or
->attach_task()") from the cgroup tree.

The latter removes the code modified by the latter, so I just removed it
(freezer_can_attach_task).

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]