The patch titled Subject: proc-pid-status-show-all-sets-of-pid-according-to-ns-fix has been removed from the -mm tree. Its filename was proc-pid-status-show-all-sets-of-pid-according-to-ns-fix.patch This patch was dropped because it was folded into proc-pid-status-show-all-sets-of-pid-according-to-ns.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: proc-pid-status-show-all-sets-of-pid-according-to-ns-fix add CONFIG_PID_NS ifdef Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx> Cc: Nathan Scott <nathans@xxxxxxxxxx> Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/array.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN fs/proc/array.c~proc-pid-status-show-all-sets-of-pid-according-to-ns-fix fs/proc/array.c --- a/fs/proc/array.c~proc-pid-status-show-all-sets-of-pid-according-to-ns-fix +++ a/fs/proc/array.c @@ -188,6 +188,7 @@ static inline void task_state(struct seq from_kgid_munged(user_ns, GROUP_AT(group_info, g))); put_cred(cred); +#ifdef CONFIG_PID_NS seq_puts(m, "\nNStgid:"); for (g = ns->level; g <= pid->level; g++) seq_printf(m, "\t%d", @@ -204,6 +205,7 @@ static inline void task_state(struct seq for (g = ns->level; g <= pid->level; g++) seq_printf(m, "\t%d", task_session_nr_ns(p, pid->numbers[g].ns)); +#endif seq_putc(m, '\n'); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-memory-failurec-define-page-types-for-action_result-in-one-place.patch document-interaction-between-compaction-and-the-unevictable-lru.patch mm-memcg-sync-allocation-and-memcg-charge-gfp-flags-for-thp.patch mm-vmalloc-occupy-newly-allocated-vmap-block-just-after-allocation.patch mm-mmapc-use-while-instead-of-ifgoto.patch mm-hugetlb-introduce-pagehugeactive-flag.patch mm-hugetlb-cleanup-using-pagehugeactive-flag.patch mm-memblock-add-debug-output-for-the-memblock_add.patch mm-uninline-and-cleanup-page-mapping-related-helpers.patch mm-cma-add-functions-to-get-region-pages-counters.patch mm-cma_debugc-remove-blank-lines-before-define_simple_attribute.patch mm-memory-print-also-a_ops-readpage-in-print_bad_pte.patch mm-compactionc-fix-suitable_migration_target-unused-warning.patch zsmalloc-support-compaction.patch proc-pid-status-show-all-sets-of-pid-according-to-ns.patch kernel-conditionally-support-non-root-users-groups-and-capabilities-checkpatch-fixes.patch lib-vsprintf-add-%pcnr-format-specifiers-for-clocks-fix.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