Merge branch 'master' into next
James Morris [Thu, 19 May 2011 08:51:57 +0000 (18:51 +1000)]
Conflicts:
include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

Signed-off-by: James Morris <jmorris@namei.org>

1  2 
include/linux/capability.h
kernel/capability.c
kernel/cred.c

Simple merge
Simple merge
diff --cc kernel/cred.c
@@@ -49,11 -49,12 +49,12 @@@ struct cred init_cred = 
        .magic                  = CRED_MAGIC,
  #endif
        .securebits             = SECUREBITS_DEFAULT,
 -      .cap_inheritable        = CAP_INIT_INH_SET,
 +      .cap_inheritable        = CAP_EMPTY_SET,
        .cap_permitted          = CAP_FULL_SET,
 -      .cap_effective          = CAP_INIT_EFF_SET,
 -      .cap_bset               = CAP_INIT_BSET,
 +      .cap_effective          = CAP_FULL_SET,
 +      .cap_bset               = CAP_FULL_SET,
        .user                   = INIT_USER,
+       .user_ns                = &init_user_ns,
        .group_info             = &init_groups,
  #ifdef CONFIG_KEYS
        .tgcred                 = &init_tgcred,