Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Conflicts:
	fs/exec.c

 Resolution summary:

    Conflict between upstream/LTS commit 9eae8ac6ab40 (fs: take
    i_mutex during prepare_binprm for set[ug]id executables) and
    android commit 9d0ff694bc22 (sched: move no_new_privs into new
    atomic flags).  Resolution: move task_no_new_privs() usage into
    new function created by upstream/LTS comit.

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/base/firmware_class.c
Simple merge

diff --cc drivers/cpuidle/governors/menu.c
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/exec.c
index cb7f31c71c6ba60e3e38118494c536751b0a2a7d,acbd7ac2deda4cbed77aecf25c22d2469f7d7234..54965313c23180bf4c0d9470ec5d9cb8497cc971
--- 1/fs/exec.c
--- 2/fs/exec.c
+++ b/fs/exec.c
@@@ -1265,6 -1265,53 +1265,53 @@@ static int check_unsafe_exec(struct lin
        return res;
  }
  
 -      if (current->no_new_privs)
+ static void bprm_fill_uid(struct linux_binprm *bprm)
+ {
+       struct inode *inode;
+       unsigned int mode;
+       kuid_t uid;
+       kgid_t gid;
+ 
+       /* clear any previous set[ug]id data from a previous binary */
+       bprm->cred->euid = current_euid();
+       bprm->cred->egid = current_egid();
+ 
+       if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
+               return;
+ 
++      if (task_no_new_privs(current))
+               return;
+ 
+       inode = file_inode(bprm->file);
+       mode = ACCESS_ONCE(inode->i_mode);
+       if (!(mode & (S_ISUID|S_ISGID)))
+               return;
+ 
+       /* Be careful if suid/sgid is set */
+       mutex_lock(&inode->i_mutex);
+ 
+       /* reload atomically mode/uid/gid now that lock held */
+       mode = inode->i_mode;
+       uid = inode->i_uid;
+       gid = inode->i_gid;
+       mutex_unlock(&inode->i_mutex);
+ 
+       /* We ignore suid/sgid if there are no mappings for them in the ns */
+       if (!kuid_has_mapping(bprm->cred->user_ns, uid) ||
+                !kgid_has_mapping(bprm->cred->user_ns, gid))
+               return;
+ 
+       if (mode & S_ISUID) {
+               bprm->per_clear |= PER_CLEAR_ON_SETID;
+               bprm->cred->euid = uid;
+       }
+ 
+       if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
+               bprm->per_clear |= PER_CLEAR_ON_SETID;
+               bprm->cred->egid = gid;
+       }
+ }
+ 
  /* 
   * Fill the binprm structure from the inode. 
   * Check permissions, then read the first 128 (BINPRM_BUF_SIZE) bytes

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

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

diff --cc fs/fuse/inode.c
Simple merge

diff --cc fs/hpfs/super.c
Simple merge

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

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

diff --cc kernel/trace/trace.h
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

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

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