The patch titled
namespaces: resolve conflicts between two patches
has been added to the -mm tree. Its filename is
nsproxy-externalizes-exit_task_namespaces-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: namespaces: resolve conflicts between two patches
From: "Serge E. Hallyn" <serue@xxxxxxxxxx>
Two patches affecting nsproxy conflicted preventing compilation. Hopefully
this resolves all the problems.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/nsproxy.h | 8 ++------
kernel/nsproxy.c | 5 +++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff -puN include/linux/nsproxy.h~nsproxy-externalizes-exit_task_namespaces-fix include/linux/nsproxy.h
--- a/include/linux/nsproxy.h~nsproxy-externalizes-exit_task_namespaces-fix
+++ a/include/linux/nsproxy.h
@@ -50,11 +50,7 @@ static inline void put_and_finalize_nspr
finalize_put_nsproxy(put_nsproxy(ns));
}
-static inline struct nsproxy *preexit_task_namespaces(struct task_struct *p)
-{
- return put_nsproxy(p->nsproxy);
-}
-
-extern void exit_task_namespaces(struct task_struct *p);
+extern struct nsproxy *preexit_task_namespaces(struct task_struct *p);
+extern void exit_task_namespaces(struct task_struct *p, struct nsproxy *ns);
#endif
diff -puN kernel/nsproxy.c~nsproxy-externalizes-exit_task_namespaces-fix kernel/nsproxy.c
--- a/kernel/nsproxy.c~nsproxy-externalizes-exit_task_namespaces-fix
+++ a/kernel/nsproxy.c
@@ -157,6 +157,11 @@ struct nsproxy *put_nsproxy(struct nspro
return NULL;
}
+struct nsproxy *preexit_task_namespaces(struct task_struct *p)
+{
+ return put_nsproxy(p->nsproxy);
+}
+
void free_nsproxy(struct nsproxy *ns)
{
if (ns->mnt_ns)
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
fix-null-nsproxy-dereference-in-proc-mounts.patch
namespaces-fix-exit-race-by-splitting-exit.patch
implement-file-posix-capabilities.patch
file-capabilities-dont-do-file-caps-if-mnt_nosuid.patch
file-capabilities-honor-secure_noroot.patch
introduce-and-use-get_task_mnt_ns.patch
introduce-and-use-get_task_mnt_ns-tweaks.patch
nsproxy-externalizes-exit_task_namespaces.patch
nsproxy-externalizes-exit_task_namespaces-fix.patch
user-namespace-add-the-framework.patch
user-namespace-add-the-framework-fix.patch
user-namespace-add-the-framework-fixes.patch
user-ns-add-user_namespace-ptr-to-vfsmount.patch
user-ns-add-user_namespace-ptr-to-vfsmount-fixes.patch
user-ns-hook-permission.patch
user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs.patch
user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs-fix.patch
user-ns-implement-shared-mounts.patch
user-ns-implement-shared-mounts-fixes.patch
user_ns-handle-file-sigio.patch
user_ns-handle-file-sigio-fix.patch
user_ns-handle-file-sigio-fix-2.patch
user-ns-implement-user-ns-unshare.patch
user-ns-implement-user-ns-unshare-tidy.patch
rename-attach_pid-to-find_attach_pid.patch
attach_pid-with-struct-pid-parameter.patch
remove-find_attach_pid.patch
statically-initialize-struct-pid-for-swapper.patch
explicitly-set-pgid-sid-of-init.patch
uts-namespace-remove-config_uts_ns.patch
ipc-namespace-remove-config_ipc_ns.patch
integrity-service-api-and-dummy-provider-fix.patch
sysctl-move-utsname-sysctls-to-their-own-file.patch
sysctl-move-sysv-ipc-sysctls-to-their-own-file.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
