The patch titled Subject: c/r: fs, proc: Move children entry back to tid_base_stuff has been removed from the -mm tree. Its filename was fs-proc-introduce-proc-pid-task-tid-children-entry-v9-fix.patch This patch was dropped because it was folded into fs-proc-introduce-proc-pid-task-tid-children-entry-v9.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Subject: c/r: fs, proc: Move children entry back to tid_base_stuff While merging to linux-next the "children" entry jumped from tid_base_stuff to tgid_base_stuff by mistake. Fix it, by moving it back. Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN fs/proc/base.c~fs-proc-introduce-proc-pid-task-tid-children-entry-v9-fix fs/proc/base.c --- a/fs/proc/base.c~fs-proc-introduce-proc-pid-task-tid-children-entry-v9-fix +++ a/fs/proc/base.c @@ -2980,9 +2980,6 @@ static const struct pid_entry tgid_base_ ONE("stat", S_IRUGO, proc_tgid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_pid_maps_operations), -#ifdef CONFIG_CHECKPOINT_RESTORE - REG("children", S_IRUGO, proc_tid_children_operations), -#endif #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_pid_numa_maps_operations), #endif @@ -3342,6 +3339,9 @@ static const struct pid_entry tid_base_s ONE("stat", S_IRUGO, proc_tid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_tid_maps_operations), +#ifdef CONFIG_CHECKPOINT_RESTORE + REG("children", S_IRUGO, proc_tid_children_operations), +#endif #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_tid_numa_maps_operations), #endif _ Patches currently in -mm which might be from gorcunov@xxxxxxxxxx are origin.patch sethostname-setdomainname-notify-userspace-when-there-is-a-change-in-uts_kern_table.patch pidns-use-task_active_pid_ns-in-do_notify_parent.patch pidns-make-killed-children-autoreap.patch sysctl-make-kernelns_last_pid-control-being-checkpoint_restore-dependent.patch fs-proc-introduce-proc-pid-task-tid-children-entry-v9.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update.patch syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix.patch c-r-procfs-add-arg_start-end-env_start-end-and-exit_code-members-to-proc-pid-stat.patch c-r-prctl-extend-pr_set_mm-to-set-up-more-mm_struct-entries-v2.patch c-r-prctl-add-ability-to-set-new-mm_struct-exe_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