copy address of proc_ns_ops into ns_common
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 1 Nov 2014 06:32:53 +0000 (02:32 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 4 Dec 2014 19:34:47 +0000 (14:34 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
13 files changed:
fs/namespace.c
fs/proc/inode.c
include/linux/ns_common.h
init/version.c
ipc/msgutil.c
ipc/namespace.c
kernel/nsproxy.c
kernel/pid.c
kernel/pid_namespace.c
kernel/user.c
kernel/user_namespace.c
kernel/utsname.c
net/core/net_namespace.c

diff --cc fs/namespace.c
Simple merge
diff --cc fs/proc/inode.c
Simple merge
Simple merge
diff --cc init/version.c
Simple merge
diff --cc ipc/msgutil.c
Simple merge
diff --cc ipc/namespace.c
Simple merge
Simple merge
diff --cc kernel/pid.c
Simple merge
Simple merge
diff --cc kernel/user.c
Simple merge
Simple merge
Simple merge
Simple merge