Messages in this thread | | | Date | Thu, 24 Nov 2011 15:20:18 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the cgroup tree with the pm tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |