diff for duplicates of <20170316053313.GA19241@bbox> diff --git a/a/1.txt b/N1/1.txt index 9213c7b..368752e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,3 +27,34 @@ I was liar so need to be a honest guy. Thanks, Sergey! Andrew, Please make me honest. Sorry about that. + +>From 286eae763d145338dc6c437258a741f293fab609 Mon Sep 17 00:00:00 2001 +From: Minchan Kim <minchan@kernel.org> +Date: Thu, 16 Mar 2017 14:20:42 +0900 +Subject: [PATCH] mm: use false instead of SWAP_FAIL + +There was mistake with git-rebase. +SWAP_FAIL was removed. Use false. +It could be folded into mm-make-ttus-return-boolean.patch. + +Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> +Signed-off-by: Minchan Kim <minchan@kernel.org> +--- + mm/rmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mm/rmap.c b/mm/rmap.c +index aa25fde..2422758 100644 +--- a/mm/rmap.c ++++ b/mm/rmap.c +@@ -1414,7 +1414,7 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, + */ + if (unlikely(PageSwapBacked(page) != PageSwapCache(page))) { + WARN_ON_ONCE(1); +- ret = SWAP_FAIL; ++ ret = false; + page_vma_mapped_walk_done(&pvmw); + break; + } +-- +2.7.4 diff --git a/a/content_digest b/N1/content_digest index d2bc541..da4b1cd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -43,6 +43,37 @@ "I was liar so need to be a honest guy.\n" "Thanks, Sergey!\n" "\n" - Andrew, Please make me honest. Sorry about that. + "Andrew, Please make me honest. Sorry about that.\n" + "\n" + ">From 286eae763d145338dc6c437258a741f293fab609 Mon Sep 17 00:00:00 2001\n" + "From: Minchan Kim <minchan@kernel.org>\n" + "Date: Thu, 16 Mar 2017 14:20:42 +0900\n" + "Subject: [PATCH] mm: use false instead of SWAP_FAIL\n" + "\n" + "There was mistake with git-rebase.\n" + "SWAP_FAIL was removed. Use false.\n" + "It could be folded into mm-make-ttus-return-boolean.patch.\n" + "\n" + "Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>\n" + "Signed-off-by: Minchan Kim <minchan@kernel.org>\n" + "---\n" + " mm/rmap.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "diff --git a/mm/rmap.c b/mm/rmap.c\n" + "index aa25fde..2422758 100644\n" + "--- a/mm/rmap.c\n" + "+++ b/mm/rmap.c\n" + "@@ -1414,7 +1414,7 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,\n" + " \t\t\t */\n" + " \t\t\tif (unlikely(PageSwapBacked(page) != PageSwapCache(page))) {\n" + " \t\t\t\tWARN_ON_ONCE(1);\n" + "-\t\t\t\tret = SWAP_FAIL;\n" + "+\t\t\t\tret = false;\n" + " \t\t\t\tpage_vma_mapped_walk_done(&pvmw);\n" + " \t\t\t\tbreak;\n" + " \t\t\t}\n" + "-- \n" + 2.7.4 -f102f1d4932ce06789156455675c54bf338033297d9ab1ddd0a0a05c3522e2aa +94a948106cb059e2b85bfba609e7b794aff1352cd3d8f496b5a3df55b515e870
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.