The patch titled Subject: mm-slub-fix-a-deadlock-in-show_slab_objects-fix has been removed from the -mm tree. Its filename was mm-slub-fix-a-deadlock-in-show_slab_objects-fix.patch This patch was dropped because it was folded into mm-slub-fix-a-deadlock-in-show_slab_objects.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-slub-fix-a-deadlock-in-show_slab_objects-fix tweak comment text Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Qian Cai <cai@xxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/mm/slub.c~mm-slub-fix-a-deadlock-in-show_slab_objects-fix +++ a/mm/slub.c @@ -4850,13 +4850,13 @@ static ssize_t show_slab_objects(struct } /* - * It is not possible to take "mem_hotplug_lock" here, as it has already held - * "kernfs_mutex" which could race with the lock order: + * It is not possible to take "mem_hotplug_lock" here, we already hold + * "kernfs_mutex" which conflict with the lock order: * * mem_hotplug_lock->slab_mutex->kernfs_mutex * - * In the worest case, it might be mis-calculated while doing NUMA node - * hotplug, but it shall be corrected by later reads of the same files. + * In the worst case, the results may me miscalculated while doing NUMA node + * hotplug, but they shall be corrected by later reads of the same files. */ #ifdef CONFIG_SLUB_DEBUG if (flags & SO_ALL) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch mm-page_alloc-fix-a-crash-in-free_pages_prepare-fix.patch mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix.patch mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix-fix.patch mm-slb-guarantee-natural-alignment-for-kmallocpower-of-two-fix.patch ocfs2-protect-extent-tree-in-the-ocfs2_prepare_inode_for_write-checkpatch-fixes.patch mm.patch mm-slub-fix-a-deadlock-in-show_slab_objects.patch mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch hugetlb-remove-duplicated-code-checkpatch-fixes.patch hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch diff-sucks.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch