The patch titled Subject: mm/swapfile.c: fix swap_count comment about nonexistent SWAP_HAS_CONT has been added to the -mm tree. Its filename is mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont.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: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx> Subject: mm/swapfile.c: fix swap_count comment about nonexistent SWAP_HAS_CONT 570a335b8e22 ("swap_info: swap count continuations") introduces COUNT_CONTINUED but refers to it incorrectly as SWAP_HAS_CONT in a comment in swap_count. Fix it. Link: http://lkml.kernel.org/r/20180612175919.30413-1-daniel.m.jordan@xxxxxxxxxx Fixes: 570a335b8e22 ("swap_info: swap count continuations") Signed-off-by: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> 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(-) diff -puN mm/swapfile.c~mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont mm/swapfile.c --- a/mm/swapfile.c~mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont +++ a/mm/swapfile.c @@ -100,7 +100,7 @@ atomic_t nr_rotate_swap = ATOMIC_INIT(0) static inline unsigned char swap_count(unsigned char ent) { - return ent & ~SWAP_HAS_CACHE; /* may include SWAP_HAS_CONT flag */ + return ent & ~SWAP_HAS_CACHE; /* may include COUNT_CONTINUED flag */ } /* returns 1 if swap entry is freed */ _ Patches currently in -mm which might be from daniel.m.jordan@xxxxxxxxxx are mm-swap-fix-swap_count-comment-about-nonexistent-swap_has_cont.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