The patch titled Subject: mm-swap-use-rbtree-for-swap_extent-fix has been added to the -mm tree. Its filename is mm-swap-use-rbtree-for-swap_extent-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-swap-use-rbtree-for-swap_extent-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-swap-use-rbtree-for-swap_extent-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-swap-use-rbtree-for-swap_extent-fix s/BUG_ON(1)/BUG()/ Cc: Aaron Lu <ziqian.lzq@xxxxxxxxxx> Cc: Huang Ying <ying.huang@xxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/swapfile.c~mm-swap-use-rbtree-for-swap_extent-fix +++ a/mm/swapfile.c @@ -218,7 +218,7 @@ offset_to_swap_extent(struct swap_info_s return se; } /* It *must* be present */ - BUG_ON(1); + BUG(); } /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-vmallocc-fix-typo-in-comment.patch mm-mmu_gather-remove-__tlb_reset_range-for-force-flush-checkpatch-fixes.patch prctl_set_mm-refactor-checks-from-validate_prctl_map-checkpatch-fixes.patch prctl_set_mm-downgrade-mmap_sem-to-read-lock-checkpatch-fixes.patch proc-report-eip-and-esp-for-all-threads-when-coredumping-fix.patch scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch include-linux-pfn_th-remove-pfn_t_to_virt.patch mm-swap-use-rbtree-for-swap_extent-fix.patch mm-add-probe_user_read-fix.patch byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch