The patch titled Subject: mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix has been added to the -mm tree. Its filename is mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix remove unneeded `else' Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/shmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN mm/shmem.c~mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix mm/shmem.c --- a/mm/shmem.c~mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix +++ a/mm/shmem.c @@ -577,8 +577,7 @@ static inline bool is_huge_enabled(struc (shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) && shmem_huge != SHMEM_HUGE_DENY) return true; - else - return false; + return false; } /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch z3fold-fix-reclaim-lock-ups-checkpatch-fixes.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch zram-introduce-zram-memory-tracking-update-fix.patch mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch mm-oom-cgroup-aware-oom-killer-fix-fix.patch proc-simpler-iterations-for-proc-cmdline-fix.patch ida-remove-simple_ida_lock-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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