The patch titled Subject: mm-remove-the-unuseful-else-after-a-return-fix has been removed from the -mm tree. Its filename was mm-remove-the-unuseful-else-after-a-return-checkpatch-fixes.patch This patch was dropped because it was folded into mm-remove-the-unuseful-else-after-a-return.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-remove-the-unuseful-else-after-a-return-fix fix coding style while we're in there Cc: Hailong Liu <carver4lio@xxxxxxx> Cc: Hailong Liu<liu.hailong6@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/filemap.c~mm-remove-the-unuseful-else-after-a-return-checkpatch-fixes +++ a/mm/filemap.c @@ -1592,8 +1592,9 @@ int __lock_page_or_retry(struct page *pa mmap_read_unlock(mm); return 0; } - } else + } else { __lock_page(page); + } return 1; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-remove-the-unuseful-else-after-a-return.patch mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch mm-memcontrol-account-pagetables-per-node-fix.patch mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch mm-cma-improve-pr_debug-log-in-cma_release-fix.patch mm.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout-checkpatch-fixes.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch lib-cmdline_kunit-add-a-new-test-suite-for-cmdline-api-fix.patch ilog2-improve-ilog2-for-constant-arguments-checkpatch-fixes.patch lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch checkpatch-fix-typo_spelling-check-for-words-with-apostrophe-fix.patch resource-fix-kernel-doc-markups-checkpatch-fixes.patch lib-ubsanc-mark-type_check_kinds-with-static-keyword-fix.patch linux-next-rejects.patch kmap-stupid-hacks-to-make-it-compile.patch epoll-wire-up-syscall-epoll_pwait2-fix.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages-fix.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch