From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 03:47:28 +0000 (+1000)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20130619~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee427a736e8764ccdcc1be776f5748ce05ae5f98;p=karo-tx-linux.git

Merge remote-tracking branch 'block/for-next'

Conflicts:
	include/linux/cgroup.h
---

ee427a736e8764ccdcc1be776f5748ce05ae5f98
diff --cc include/linux/cgroup.h
index e92e64736ecc,09f1a1408ae0..abaece5326bd
--- 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),