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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 24 Nov 2011 13:12:29 -0800
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Michal Hocko <mhocko@...e.cz>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: Re: linux-next: manual merge of the cgroup tree with the pm tree

Hello,

On Wed, Nov 23, 2011 at 8:20 PM, Stephen Rothwell <sfr@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/