Merge tag 'v4.4.22' into android-4.4.y

This is the 4.4.22 stable release

Change-Id: Id49e3c87d2cacb2fa85d85a17226f718f4a5ac28

diff --cc arch/arm64/include/asm/spinlock.h
Simple merge

diff --cc arch/x86/include/asm/uaccess.h
Simple merge

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc fs/ext4/ioctl.c
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/cpuset.c
index e2e294d,e120bd9..f4d6afa
--- 1/kernel/cpuset.c
--- 2/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@@ -2084,23 -2074,20 +2084,37 @@@ static void cpuset_bind(struct cgroup_s
        mutex_unlock(&cpuset_mutex);
  }
  
 +static int cpuset_allow_attach(struct cgroup_taskset *tset)
 +{
 +      const struct cred *cred = current_cred(), *tcred;
 +      struct task_struct *task;
 +      struct cgroup_subsys_state *css;
 +
 +      cgroup_taskset_for_each(task, css, tset) {
 +              tcred = __task_cred(task);
 +
 +              if ((current != task) && !capable(CAP_SYS_ADMIN) &&
 +                   cred->euid.val != tcred->uid.val && cred->euid.val != tcred->suid.val)
 +                      return -EACCES;
 +      }
 +
 +      return 0;
 +}
 +
+ /*
+  * Make sure the new task conform to the current state of its parent,
+  * which could have been changed by cpuset just after it inherits the
+  * state from the parent and before it sits on the cgroup's task list.
+  */
+ void cpuset_fork(struct task_struct *task)
+ {
+       if (task_css_is_root(task, cpuset_cgrp_id))
+               return;
+ 
+       set_cpus_allowed_ptr(task, &current->cpus_allowed);
+       task->mems_allowed = current->mems_allowed;
+ }
+ 
  struct cgroup_subsys cpuset_cgrp_subsys = {
        .css_alloc      = cpuset_css_alloc,
        .css_online     = cpuset_css_online,

diff --cc kernel/fork.c
Simple merge

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

diff --cc net/ipv6/addrconf.c
Simple merge