From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jan 2014 19:10:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v3.14-rc1~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4a63a83933bcd1ef4f3ff6e8637e187dea25632;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull user namespaces work from Eric Biederman:
 "The work to convert the kernel to use kuid_t and kgid_t has been
  finished since 3.12 so it is time to remove the scaffolding that
  allowed the work to progress incrementally.

  The first patch on this branch just removes the scaffolding, ensuring
  we will always get compile errors if people accidentally try the
  userspace and the kernel uid and gid types.  The second patch an
  overlooked and unused chunk of mips code that that fails to build
  after the first patch.

  The code hasn't been in linux-next for long (as I was out of it and
  could not sheppared the cold properly) but the patch has been around
  for a long time just waiting for the day when I had finished the
  uid/gid conversions.  Putting the code in linux-next did find the
  compile failure on mips so I took the time to get that fix reviewed
  and included.  Beyond that I am not too worried about errors because
  all these two patches do is delete a modest amount of code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  MIPS: VPE: Remove vpe_getuid and vpe_getgid
  userns:  userns: Remove UIDGID_STRICT_TYPE_CHECKS
---

d4a63a83933bcd1ef4f3ff6e8637e187dea25632
diff --cc init/Kconfig
index 8d402e3,d4eb994..34a0a3b
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -1149,17 -1141,9 +1147,8 @@@ config NET_N
  
  endif # NAMESPACES
  
- config UIDGID_STRICT_TYPE_CHECKS
- 	bool "Require conversions between uid/gids and their internal representation"
- 	default n
- 	help
- 	 While the nececessary conversions are being added to all subsystems this option allows
- 	 the code to continue to build for unconverted subsystems.
- 
- 	 Say Y here if you want the strict type checking enabled
- 
  config SCHED_AUTOGROUP
  	bool "Automatic process group scheduling"
 -	select EVENTFD
  	select CGROUPS
  	select CGROUP_SCHED
  	select FAIR_GROUP_SCHED