From: Linus Torvalds Date: Thu, 27 Dec 2012 18:42:46 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... X-Git-Tag: v3.8-rc2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddf75ae34e61bc8472f8b54281ad29bc87274be1;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace Pull namespace fixes from Eric Biederman: "This tree includes two bug fixes for problems Oleg spotted on his review of the recent pid namespace work. A small fix to not enable bottom halves with irqs disabled, and a trivial build fix for f2fs with user namespaces enabled." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: f2fs: Don't assign e_id in f2fs_acl_from_disk proc: Allow proc_free_inum to be called from any context pidns: Stop pid allocation when init dies pidns: Outlaw thread creation after unshare(CLONE_NEWPID) --- ddf75ae34e61bc8472f8b54281ad29bc87274be1