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

diff --cc kernel/cgroup.c
index 0e0b20b8c5db172e8dc07fe4de10358c19939d60,36ded4a38b84ec6658c60ebc5ad956adf821ef82..a6bb5f678d6950a1ed14f2bb182982745e10a781
--- 1/kernel/cgroup.c
--- 2/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -802,9 -804,9 +804,8 @@@ static struct cgroup *task_cgroup_from_
   */
  
  static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
 -static struct dentry *cgroup_lookup(struct inode *, struct dentry *, unsigned int);
  static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry);
- static int cgroup_populate_dir(struct cgroup *cgrp, bool base_files,
-                              unsigned long subsys_mask);
+ static int cgroup_populate_dir(struct cgroup *cgrp, unsigned long subsys_mask);
  static const struct inode_operations cgroup_dir_inode_operations;
  static const struct file_operations proc_cgroupstats_operations;