The patch titled ipc namespace: remove config ipc ns fix has been added to the -mm tree. Its filename is ipc-namespace-remove-config-ipc-ns-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: ipc namespace: remove config ipc ns fix From: Cedric Le Goater <clg@xxxxxxxxxx> Finish the work : kill all #ifdef CONFIG_IPC_NS. Thanks Robert ! Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx> Cc: Eric Biederman <ebiederm@xxxxxxxxxxx> Cc: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/ipc_sysctl.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN ipc/ipc_sysctl.c~ipc-namespace-remove-config-ipc-ns-fix ipc/ipc_sysctl.c --- a/ipc/ipc_sysctl.c~ipc-namespace-remove-config-ipc-ns-fix +++ a/ipc/ipc_sysctl.c @@ -15,7 +15,6 @@ #include <linux/sysctl.h> #include <linux/uaccess.h> -#ifdef CONFIG_IPC_NS static void *get_ipc(ctl_table *table) { char *which = table->data; @@ -23,9 +22,6 @@ static void *get_ipc(ctl_table *table) which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns; return which; } -#else -#define get_ipc(T) ((T)->data) -#endif #ifdef CONFIG_PROC_FS static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp, _ Patches currently in -mm which might be from clg@xxxxxxxxxx are handle-the-multi-threaded-inits-exit-properly.patch ipc-namespace-remove-config-ipc-ns-fix.patch task-containersv11-basic-task-container-framework.patch task-containersv11-add-tasks-file-interface.patch task-containersv11-add-fork-exit-hooks.patch task-containersv11-add-container_clone-interface.patch task-containersv11-add-procfs-interface.patch task-containersv11-shared-container-subsystem-group-arrays.patch task-containersv11-automatic-userspace-notification-of-idle-containers.patch task-containersv11-make-cpusets-a-client-of-containers.patch task-containersv11-example-cpu-accounting-subsystem.patch task-containersv11-simple-task-container-debug-info-subsystem.patch containers-implement-namespace-tracking-subsystem-fix-order-of-container-subsystems-in-init-kconfig.patch pid-namespaces-round-up-the-api.patch pid-namespaces-make-get_pid_ns-return-the-namespace-itself.patch pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces.patch pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces-fix.patch pid-namespaces-define-and-use-task_active_pid_ns-wrapper.patch pid-namespaces-rename-child_reaper-function.patch pid-namespaces-use-task_pid-to-find-leaders-pid.patch pid-namespaces-define-is_global_init-and-is_container_init.patch pid-namespaces-define-is_global_init-and-is_container_init-fix.patch pid-namespaces-define-is_global_init-and-is_container_init-fix-capabilityc-to-work-with-threaded-init.patch pid-namespaces-define-is_global_init-and-is_container_init-versus-x86_64-mm-i386-show-unhandled-signals-v3.patch pid-namespaces-move-alloc_pid-to-copy_process.patch isolate-the-explicit-usage-of-signal-pgrp.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