linux-kernel - linux-next: manual merge of the block tree with the cgroup 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: <20130619134733.fcb49f4df20ec60cf51d6588@canb.auug.org.au>
Date:	Wed, 19 Jun 2013 13:47:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>
Subject: linux-next: manual merge of the block tree with the cgroup tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
include/linux/cgroup.h between commit f63674fd0d6a ("cgroup: update
sane_behavior documentation") from the cgroup tree and commit
9138125beabb ("blk-throttle: implement proper hierarchy support") from
the block tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/cgroup.h
index e92e647,09f1a14..0000000
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@@ -261,23 -269,15 +261,25 @@@ enum 
  	 *
  	 * - Remount is disallowed.
  	 *
 +	 * - "tasks" is removed.  Everything should be at process
 +	 *   granularity.  Use "cgroup.procs" instead.
 +	 *
 +	 * - "release_agent" and "notify_on_release" are removed.
 +	 *   Replacement notification mechanism will be implemented.
 +	 *
 +	 * - rename(2) is disallowed.
 +	 *
 +	 * - cpuset: tasks will be kept in empty cpusets when hotplug happens
 +	 *   and take masks of ancestors with non-empty cpus/mems, instead of
 +	 *   being moved to an ancestor.
 +	 *
 +	 * - cpuset: a task can be moved into an empty cpuset, and again it
 +	 *   takes masks of ancestors.
 +	 *
  	 * - memcg: use_hierarchy is on by default and the cgroup file for
  	 *   the flag is not created.
+ 	 *
+ 	 * - blkcg: blk-throttle becomes properly hierarchical.
 -	 *
 -	 * The followings are planned changes.
 -	 *
 -	 * - release_agent will be disallowed once replacement notification
 -	 *   mechanism is implemented.
  	 */
  	CGRP_ROOT_SANE_BEHAVIOR	= (1 << 0),
  

Content of type "application/pgp-signature" skipped