|author||Linus Torvalds <firstname.lastname@example.org>||2014-01-25 11:10:14 -0800|
|committer||Linus Torvalds <email@example.com>||2014-01-25 11:10:14 -0800|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'init')
1 files changed, 0 insertions, 11 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 8d402e33b7fc..34a0a3bf2390 100644
@@ -1116,8 +1116,6 @@ config IPC_NS
bool "User namespace"
- select UIDGID_STRICT_TYPE_CHECKS
This allows containers, i.e. vservers, to use user namespaces
@@ -1149,15 +1147,6 @@ config NET_NS
endif # NAMESPACES
- bool "Require conversions between uid/gids and their internal representation"
- default n
- 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
bool "Automatic process group scheduling"