Merge tag 'v3.4-rc5' into next

Linux 3.4-rc5

Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a

Requested by Casey.

diff --cc MAINTAINERS
Simple merge

diff --cc include/asm-generic/siginfo.h
index af5d0350f84cc030070e656445ef908bb29648ac,5e5e3865f1edb3df5b928b6d0b2951b91c3dbccc..8ed67779fc09cef1b60407e4eb5361aadbeb7027
--- 1/include/asm-generic/siginfo.h
--- 2/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@@ -90,18 -98,9 +98,18 @@@ typedef struct siginfo 
                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
                        int _fd;
                } _sigpoll;
 +
 +              /* SIGSYS */
 +              struct {
 +                      void __user *_call_addr; /* calling user insn */
 +                      int _syscall;   /* triggering system call number */
 +                      unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
 +              } _sigsys;
        } _sifields;
- } siginfo_t;
+ } __ARCH_SI_ATTRIBUTES siginfo_t;
  
 +/* If the arch shares siginfo, then it has SIGSYS. */
 +#define __ARCH_SIGSYS
  #endif
  
  /*

diff --cc security/commoncap.c
index edd3918fac02793991db97ae0c937cb09f04c319,71a166a05975bfef1ea92f68473dc147063b4a7b..f80d116093915acb906b7bd80a9424d5d1f98f0b
--- 1/security/commoncap.c
--- 2/security/commoncap.c
+++ b/security/commoncap.c
@@@ -505,10 -506,13 +506,15 @@@ int cap_bprm_set_creds(struct linux_bin
        }
  skip:
  
+       /* if we have fs caps, clear dangerous personality flags */
+       if (!cap_issubset(new->cap_permitted, old->cap_permitted))
+               bprm->per_clear |= PER_CLEAR_ON_SETID;
+ 
+ 
        /* Don't let someone trace a set[ug]id/setpcap binary with the revised
 -       * credentials unless they have the appropriate permit
 +       * credentials unless they have the appropriate permit.
 +       *
 +       * In addition, if NO_NEW_PRIVS, then ensure we get no new privs.
         */
        if ((new->euid != old->uid ||
             new->egid != old->gid ||