linux-kernel - 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>] [day] [month] [year] [list]

Message-Id: <20111125142111.ddfd48752425ddf79f194770@canb.auug.org.au>
Date:	Fri, 25 Nov 2011 14:21:11 +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,
	"Rafael J. Wysocki" <rjw@...k.pl>
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 22b4e111fa01 ("cgroup_freezer:
prepare for removal of TIF_FREEZE") from the pm tree and commit
cfb5ec210751 ("cgroup: don't use subsys->can_attach_task() or
->attach_task()") from the cgroup tree.

The latter removes the code modified by the latter, so I just removed it
(freezer_can_attach_task).

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

Content of type "application/pgp-signature" skipped