From: James Morris <jmorris@namei.org>
Date: Thu, 19 May 2011 08:51:57 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12a5a2621b1ee14d32beca35304d7c6076a58815;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' into next

Conflicts:
	include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

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

12a5a2621b1ee14d32beca35304d7c6076a58815
diff --cc kernel/cred.c
index b982f0863ae,8093c16b84b..e12c8af793f
--- a/kernel/cred.c
+++ b/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,