merge conflict resolution for pm-freezer

merge conflict resolution for pm-freezer

[Tejun Heo]

Hello, Rafael, Stephen.

Linus just pulled cgroup fixes which conflicts with pm-freezer.  The
resolution is mostly trivial.  The cgroup fix changes frozen() test to
is_task_frozen_enough() while pm-freezer commit prepends "freezing()
&& " to it.  They just need to be combined into "freezing() &&
is_task_frozen_enough()".

The following git branch contains merged branch.  I pulled the current
linus/master a34815b96 "Merge branch 'for-3.2-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup" into
pm-freezer and resolved the conflict described above.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer-merge

Rafael, please feel free to pull or resolve in any way you see fit.

Thanks.

-- 
tejun

Re: merge conflict resolution for pm-freezer

[Rafael J. Wysocki]

On Tuesday, November 29, 2011, Tejun Heo wrote:
> Hello, Rafael, Stephen.
> 
> Linus just pulled cgroup fixes which conflicts with pm-freezer.  The
> resolution is mostly trivial.  The cgroup fix changes frozen() test to
> is_task_frozen_enough() while pm-freezer commit prepends "freezing()
> && " to it.  They just need to be combined into "freezing() &&
> is_task_frozen_enough()".
> 
> The following git branch contains merged branch.  I pulled the current
> linus/master a34815b96 "Merge branch 'for-3.2-fixes' of
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup" into
> pm-freezer and resolved the conflict described above.
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer-merge
> 
> Rafael, please feel free to pull or resolve in any way you see fit.

Well, could you please post a fix patch on top of my pm-freezer branch?
That would be the most convenient way to me. :-)

Thanks,
Rafael

Re: merge conflict resolution for pm-freezer

[Rafael J. Wysocki]

On Tuesday, November 29, 2011, Rafael J. Wysocki wrote:
> On Tuesday, November 29, 2011, Tejun Heo wrote:
> > Hello, Rafael, Stephen.
> > 
> > Linus just pulled cgroup fixes which conflicts with pm-freezer.  The
> > resolution is mostly trivial.  The cgroup fix changes frozen() test to
> > is_task_frozen_enough() while pm-freezer commit prepends "freezing()
> > && " to it.  They just need to be combined into "freezing() &&
> > is_task_frozen_enough()".
> > 
> > The following git branch contains merged branch.  I pulled the current
> > linus/master a34815b96 "Merge branch 'for-3.2-fixes' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup" into
> > pm-freezer and resolved the conflict described above.
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer-merge
> > 
> > Rafael, please feel free to pull or resolve in any way you see fit.
> 
> Well, could you please post a fix patch on top of my pm-freezer branch?
> That would be the most convenient way to me. :-)

No, that won't work.  I think I'll resolve the conflict when merging pm-freezer
into pm-for-linus later.

Thanks,
Rafael

Re: merge conflict resolution for pm-freezer

[Tejun Heo]

Hello, Rafael.  (Sorry about the delay).

On Wed, Nov 30, 2011 at 08:51:54PM +0100, Rafael J. Wysocki wrote:
> > > Rafael, please feel free to pull or resolve in any way you see fit.
> > 
> > Well, could you please post a fix patch on top of my pm-freezer branch?
> > That would be the most convenient way to me. :-)
> 
> No, that won't work.  I think I'll resolve the conflict when merging pm-freezer
> into pm-for-linus later.

Heh, yeah, I was a bit confused.  If you don't want to pull it
directly, I think the best way would be merging and then comparing the
two trees.

Thanks.

-- 
tejun

Re: merge conflict resolution for pm-freezer

[Rafael J. Wysocki]

On Thursday, December 01, 2011, Tejun Heo wrote:
> Hello, Rafael.  (Sorry about the delay).
> 
> On Wed, Nov 30, 2011 at 08:51:54PM +0100, Rafael J. Wysocki wrote:
> > > > Rafael, please feel free to pull or resolve in any way you see fit.
> > > 
> > > Well, could you please post a fix patch on top of my pm-freezer branch?
> > > That would be the most convenient way to me. :-)
> > 
> > No, that won't work.  I think I'll resolve the conflict when merging pm-freezer
> > into pm-for-linus later.
> 
> Heh, yeah, I was a bit confused.  If you don't want to pull it
> directly, I think the best way would be merging and then comparing the
> two trees.

Can you please double check if cgroup_freezer.c is correct in my linux-next
branch?

Rafael

[PATCH pm/linux-next] cgroup_freezer: drop unnecessary freezing() from try_to_freeze_cgroup()

[Tejun Heo]

986b11c3ee "Merge branch 'pm-freezer' of ..." added unnecessary
freezing() test in try_to_freeze_cgroup() while merging.  Drop it.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
This shouldn't be harmful but still is unnecessary.

Thanks.

 kernel/cgroup_freezer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- work/kernel/cgroup_freezer.c	2011-12-05 13:25:34.156948390 -0800
+++ misc/kernel/cgroup_freezer.c	2011-12-05 13:26:58.787447558 -0800
@@ -283,7 +283,7 @@
 	while ((task = cgroup_iter_next(cgroup, &it))) {
 		if (!freeze_task(task))
 			continue;
-		if (freezing(task) && is_task_frozen_enough(task))
+		if (is_task_frozen_enough(task))
 			continue;
 		if (!freezing(task) && !freezer_should_skip(task))
 			num_cant_freeze_now++;