| commit | 14d74e0cab7a7779a7ff0c3863c04c8a8e507106 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 26 May 2011 01:10:16 +0000 (25 18:10 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 26 May 2011 01:10:16 +0000 (25 18:10 -0700) | ||
| tree | 5e27d7495f8f7ce178b637d588ec42bd7b4173d8 | treesnapshot (tar.gz zip) |
| parent | 49a78d085fa6b44d6ed791923c7172a6433589c2 | commitdiff |
| parent | 956c920786694f51601a0ef7ee12956fd6aa216e | commitdiff |
Merge git://git./linux/kernel/git/ebiederm/linux-2.6-nsfd
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
net: fix get_net_ns_by_fd for !CONFIG_NET_NS
ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
ns: Declare sys_setns in syscalls.h
net: Allow setting the network namespace by fd
ns proc: Add support for the ipc namespace
ns proc: Add support for the uts namespace
ns proc: Add support for the network namespace.
ns: Introduce the setns syscall
ns: proc files for namespace naming policy.
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
net: fix get_net_ns_by_fd for !CONFIG_NET_NS
ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
ns: Declare sys_setns in syscalls.h
net: Allow setting the network namespace by fd
ns proc: Add support for the ipc namespace
ns proc: Add support for the uts namespace
ns proc: Add support for the network namespace.
ns: Introduce the setns syscall
ns: proc files for namespace naming policy.