The patch titled Subject: ocfs2-remove-__mlog_cpu_guess-fix has been removed from the -mm tree. Its filename was ocfs2-remove-__mlog_cpu_guess-fix.patch This patch was dropped because it was folded into ocfs2-remove-__mlog_cpu_guess.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: ocfs2-remove-__mlog_cpu_guess-fix printk warning Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/cluster/masklog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/cluster/masklog.c~ocfs2-remove-__mlog_cpu_guess-fix fs/ocfs2/cluster/masklog.c --- a/fs/ocfs2/cluster/masklog.c~ocfs2-remove-__mlog_cpu_guess-fix +++ a/fs/ocfs2/cluster/masklog.c @@ -90,7 +90,7 @@ void __mlog_printk(const u64 *mask, cons vaf.fmt = fmt; vaf.va = &args; - printk("%s(%s,%u,%lu):%s:%d %s%pV", + printk("%s(%s,%u,%u):%s:%d %s%pV", level, current->comm, task_pid_nr(current), raw_smp_processor_id(), func, line, prefix, &vaf); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch ocfs2-reduce-object-size-of-mlog-uses.patch ocfs2-remove-__mlog_cpu_guess.patch ocfs2-fix-null-pointer-dereference-in-function-ocfs2_abort_trigger-fix.patch mm-slab_common-support-the-slub_debug-boot-option-on-specific-object-size-fix.patch mm-fix-mprotect-behaviour-on-vm_locked-vmas-fix.patch mm-new-mm-hook-framework.patch mm-memory-failure-introduce-get_hwpoison_page-for-consistent-refcount-handling-fix.patch rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix.patch rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix-fix.patch hugetlb-do-not-account-hugetlb-pages-as-nr_file_pages-fix.patch mm-do-not-ignore-mapping_gfp_mask-in-page-cache-allocation-paths-checkpatch-fixes.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