Skip to contentSkip to conversation

merge conflict resolution for pm-freezer

PATCH New Tejun Heo 2 participants 6 messages Nov 28, 2011 – Dec 5, 2011 Linux-next tree

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

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.

Signature · 1 line
tejun
#1 lore raw
Quoted 8 lines · 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()".

Quoted 8 lines

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

#2 lore raw
Quoted 14 lines · Rafael J. Wysocki
Quoted 13 lines · 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.

Quoted 6 lines
Quoted 3 lines

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

author
#3 lore raw

Hello, Rafael. (Sorry about the delay).

Quoted 7 lines · Rafael J. Wysocki
Quoted 4 lines
Quoted 1 line

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.

Signature · 1 line
tejun
#4 lore raw
Quoted 8 lines · Tejun Heo

Hello, Rafael. (Sorry about the delay).

Quoted 5 lines · Rafael J. Wysocki
Quoted 4 lines
Quoted 1 line

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. :-)

Quoted 6 lines
Quoted 2 lines

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

author
#5 lore raw

PATCH 1/1 cgroup_freezer: drop unnecessary freezing() from try_to_freeze_cgroup()

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

Signed-off-by Tejun Heo <[email protected]>

---
This shouldn't be harmful but still is unnecessary.

Thanks.

 kernel/cgroup_freezer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup_freezer.c +1 -1
@@ -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++;