diff for duplicates of <20160707194024.GA26580@cmpxchg.org> diff --git a/a/1.txt b/N1/1.txt index 5f64e80..9ed3ee8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,43 +21,3 @@ Thanks! Agreed. Andrew, could you please fold this? - -From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001 -From: Johannes Weiner <hannes@cmpxchg.org> -Date: Thu, 7 Jul 2016 15:38:26 -0400 -Subject: [PATCH] mm: fix vm-scalability regression in cgroup-aware workingset - code fix - -Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> ---- - include/linux/mm.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index b21e5f30378e..97065e1f0237 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -975,6 +975,7 @@ static inline struct mem_cgroup *page_memcg(struct page *page) - } - static inline struct mem_cgroup *page_memcg_rcu(struct page *page) - { -+ WARN_ON_ONCE(!rcu_read_lock_held()); - return READ_ONCE(page->mem_cgroup); - } - #else -@@ -984,6 +985,7 @@ static inline struct mem_cgroup *page_memcg(struct page *page) - } - static inline struct mem_cgroup *page_memcg_rcu(struct page *page) - { -+ WARN_ON_ONCE(!rcu_read_lock_held()); - return NULL; - } - #endif --- -2.9.0 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 85bb1a5..56010cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -36,46 +36,6 @@ "\n" "Agreed.\n" "\n" - "Andrew, could you please fold this?\n" - "\n" - "From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001\n" - "From: Johannes Weiner <hannes@cmpxchg.org>\n" - "Date: Thu, 7 Jul 2016 15:38:26 -0400\n" - "Subject: [PATCH] mm: fix vm-scalability regression in cgroup-aware workingset\n" - " code fix\n" - "\n" - "Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" - "---\n" - " include/linux/mm.h | 2 ++\n" - " 1 file changed, 2 insertions(+)\n" - "\n" - "diff --git a/include/linux/mm.h b/include/linux/mm.h\n" - "index b21e5f30378e..97065e1f0237 100644\n" - "--- a/include/linux/mm.h\n" - "+++ b/include/linux/mm.h\n" - "@@ -975,6 +975,7 @@ static inline struct mem_cgroup *page_memcg(struct page *page)\n" - " }\n" - " static inline struct mem_cgroup *page_memcg_rcu(struct page *page)\n" - " {\n" - "+\tWARN_ON_ONCE(!rcu_read_lock_held());\n" - " \treturn READ_ONCE(page->mem_cgroup);\n" - " }\n" - " #else\n" - "@@ -984,6 +985,7 @@ static inline struct mem_cgroup *page_memcg(struct page *page)\n" - " }\n" - " static inline struct mem_cgroup *page_memcg_rcu(struct page *page)\n" - " {\n" - "+\tWARN_ON_ONCE(!rcu_read_lock_held());\n" - " \treturn NULL;\n" - " }\n" - " #endif\n" - "-- \n" - "2.9.0\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + Andrew, could you please fold this? -1c14cbbd9bc358ae66cdc67d2d35b1daab837f8ba958e548492573076e193356 +1fcd7c2e91f2d87de6f929437cf0507ff98e0fda118c019297f8723de9d0493d
diff --git a/a/1.txt b/N2/1.txt index 5f64e80..49df132 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,7 +22,7 @@ Agreed. Andrew, could you please fold this? -From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001 +>From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001 From: Johannes Weiner <hannes@cmpxchg.org> Date: Thu, 7 Jul 2016 15:38:26 -0400 Subject: [PATCH] mm: fix vm-scalability regression in cgroup-aware workingset @@ -55,9 +55,3 @@ index b21e5f30378e..97065e1f0237 100644 #endif -- 2.9.0 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 85bb1a5..ac926fd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -38,7 +38,7 @@ "\n" "Andrew, could you please fold this?\n" "\n" - "From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001\n" + ">From ed49e364e47c933d84533a0d8bd355831b5ca9f1 Mon Sep 17 00:00:00 2001\n" "From: Johannes Weiner <hannes@cmpxchg.org>\n" "Date: Thu, 7 Jul 2016 15:38:26 -0400\n" "Subject: [PATCH] mm: fix vm-scalability regression in cgroup-aware workingset\n" @@ -70,12 +70,6 @@ " }\n" " #endif\n" "-- \n" - "2.9.0\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 2.9.0 -1c14cbbd9bc358ae66cdc67d2d35b1daab837f8ba958e548492573076e193356 +988c5f420f78c544f471043667d197e51547541904cf4e53679c245cee3e4603
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.