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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Fri, 25 Nov 2011 10:13:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
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

Hi Tejun,

On Thu, 24 Nov 2011 13:12:29 -0800 Tejun Heo <tj@...nel.org> wrote:
>
> 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.

Thanks, I have updated my merge resolution.

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

Content of type "application/pgp-signature" skipped