Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
 "cgroup file type addition / removal is updated so that file types are
  added and removed instead of individual files so that dynamic file
  type addition / removal can be implemented by cgroup and used by
  controllers.  blkio controller changes which will come through block
  tree are dependent on this.  Other changes include res_counter cleanup
  and disallowing kthread / PF_THREAD_BOUND threads to be attached to
  non-root cgroups.

  There's a reported bug with the file type addition / removal handling
  which can lead to oops on cgroup umount.  The issue is being looked
  into.  It shouldn't cause problems for most setups and isn't a
  security concern."

Fix up trivial conflict in Documentation/feature-removal-schedule.txt

* 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)
  res_counter: Account max_usage when calling res_counter_charge_nofail()
  res_counter: Merge res_counter_charge and res_counter_charge_nofail
  cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads
  cgroup: remove cgroup_subsys->populate()
  cgroup: get rid of populate for memcg
  cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
  cgroup: make css->refcnt clearing on cgroup removal optional
  cgroup: use negative bias on css->refcnt to block css_tryget()
  cgroup: implement cgroup_rm_cftypes()
  cgroup: introduce struct cfent
  cgroup: relocate __d_cgrp() and __d_cft()
  cgroup: remove cgroup_add_file[s]()
  cgroup: convert memcg controller to the new cftype interface
  memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP
  cgroup: convert all non-memcg controllers to the new cftype interface
  cgroup: relocate cftype and cgroup_subsys definitions in controllers
  cgroup: merge cft_release_agent cftype array into the base files array
  cgroup: implement cgroup_add_cftypes() and friends
  cgroup: build list of all cgroups under a given cgroupfs_root
  cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()
  ...

diff --cc Documentation/feature-removal-schedule.txt
index e9abede,5298e12..1e69a81
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -541,18 -542,9 +541,29 @@@ Who:     Kees Cook <keescook@chromium.org
  
  ----------------------------
  
 +What: setitimer accepts user NULL pointer (value)
 +When: 3.6
 +Why:  setitimer is not returning -EFAULT if user pointer is NULL. This
 +      violates the spec.
 +Who:  Sasikantha Babu <sasikanth.v19@gmail.com>
 +
 +----------------------------
 +
 +What: V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls
 +When: 3.7
 +Why:  The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated
 +      for about 4 years and they are not used by any mainline driver.
 +      There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide
 +      similar functionality.
 +Who:  Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
++
++----------------------------
++
+ What: cgroup option updates via remount
+ When: March 2013
+ Why:  Remount currently allows changing bound subsystems and
+       release_agent.  Rebinding is hardly useful as it only works
+       when the hierarchy is empty and release_agent itself should be
+       replaced with conventional fsnotify.
++
++----------------------------

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/core/netprio_cgroup.c
Simple merge

diff --cc net/core/sock.c
Simple merge