diff for duplicates of <20151210205011.GA4967@cmpxchg.org>
diff --git a/a/1.txt b/N1/1.txt
index b61b11f..9d2109b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,27 +1 @@
-Narf. Almost there...
-
->From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001
-From: Johannes Weiner <hannes@cmpxchg.org>
-Date: Thu, 10 Dec 2015 15:42:54 -0500
-Subject: [PATCH] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG fix
-
-Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
----
- include/linux/slab.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 3ffee74..3627d5c 100644
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -86,7 +86,7 @@
- #else
- # define SLAB_FAILSLAB 0x00000000UL
- #endif
--#ifdef CONFIG_MEMCG_KMEM
-+#if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
- # define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */
- #else
- # define SLAB_ACCOUNT 0x00000000UL
---
-2.6.3
\ No newline at end of file
+Narf. Almost there...
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 79b6433..d755556 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -35,33 +35,7 @@
"b\0"
]
[
- "Narf. Almost there...\n",
- "\n",
- ">From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001\n",
- "From: Johannes Weiner <hannes\@cmpxchg.org>\n",
- "Date: Thu, 10 Dec 2015 15:42:54 -0500\n",
- "Subject: [PATCH] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG fix\n",
- "\n",
- "Signed-off-by: Johannes Weiner <hannes\@cmpxchg.org>\n",
- "---\n",
- " include/linux/slab.h | 2 +-\n",
- " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/include/linux/slab.h b/include/linux/slab.h\n",
- "index 3ffee74..3627d5c 100644\n",
- "--- a/include/linux/slab.h\n",
- "+++ b/include/linux/slab.h\n",
- "\@\@ -86,7 +86,7 \@\@\n",
- " #else\n",
- " # define SLAB_FAILSLAB\t\t0x00000000UL\n",
- " #endif\n",
- "-#ifdef CONFIG_MEMCG_KMEM\n",
- "+#if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)\n",
- " # define SLAB_ACCOUNT\t\t0x04000000UL\t/* Account to memcg */\n",
- " #else\n",
- " # define SLAB_ACCOUNT\t\t0x00000000UL\n",
- "-- \n",
- "2.6.3"
+ "Narf. Almost there..."
]
-699e02f255221ca601df77cd7a3c56c5ffdfcb7fbcc90f79acd12ec86e1f4ba8
+8f680dca692dab55d5e61cb49a973eaa8268968cb3cb04c25ef142c9539d5bd5
diff --git a/a/1.txt b/N2/1.txt
index b61b11f..119fcc0 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,11 +1,11 @@
Narf. Almost there...
->From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001
-From: Johannes Weiner <hannes@cmpxchg.org>
+From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001
+From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Date: Thu, 10 Dec 2015 15:42:54 -0500
Subject: [PATCH] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG fix
-Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
+Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
---
include/linux/slab.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/a/content_digest b/N2/content_digest
index 79b6433..265d3aa 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,10 @@
"ref\00020151210202244.GA4809\@cmpxchg.org\0"
]
[
- "From\0Johannes Weiner <hannes\@cmpxchg.org>\0"
+ "ref\00020151210202244.GA4809-druUgvl0LCNAfugRpC6u6w\@public.gmane.org\0"
+]
+[
+ "From\0Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w\@public.gmane.org>\0"
]
[
"Subject\0Re: [PATCH 6/8 v2] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG\0"
@@ -17,16 +20,16 @@
"Date\0Thu, 10 Dec 2015 15:50:11 -0500\0"
]
[
- "To\0Andrew Morton <akpm\@linux-foundation.org>\0"
+ "To\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b\@public.gmane.org>\0"
]
[
- "Cc\0Michal Hocko <mhocko\@suse.cz>",
- " Vladimir Davydov <vdavydov\@virtuozzo.com>",
- " linux-mm\@kvack.org",
- " cgroups\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " kernel-team\@fb.com",
- " Arnd Bergmann <arnd\@arndb.de>\0"
+ "Cc\0Michal Hocko <mhocko-AlSwsSmVLrQ\@public.gmane.org>",
+ " Vladimir Davydov <vdavydov-5HdwGun5lf+gSpxsJD1C4w\@public.gmane.org>",
+ " linux-mm-Bw31MaZKKs3YtjvyW6yDsg\@public.gmane.org",
+ " cgroups-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " kernel-team-b10kYP2dOMg\@public.gmane.org",
+ " Arnd Bergmann <arnd-r2nGTMty4D4\@public.gmane.org>\0"
]
[
"\0000:1\0"
@@ -37,12 +40,12 @@
[
"Narf. Almost there...\n",
"\n",
- ">From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001\n",
- "From: Johannes Weiner <hannes\@cmpxchg.org>\n",
+ "From db4522b2b3e6ca8ce5f6e673948772bcd8fdd298 Mon Sep 17 00:00:00 2001\n",
+ "From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w\@public.gmane.org>\n",
"Date: Thu, 10 Dec 2015 15:42:54 -0500\n",
"Subject: [PATCH] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG fix\n",
"\n",
- "Signed-off-by: Johannes Weiner <hannes\@cmpxchg.org>\n",
+ "Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w\@public.gmane.org>\n",
"---\n",
" include/linux/slab.h | 2 +-\n",
" 1 file changed, 1 insertion(+), 1 deletion(-)\n",
@@ -64,4 +67,4 @@
"2.6.3"
]
-699e02f255221ca601df77cd7a3c56c5ffdfcb7fbcc90f79acd12ec86e1f4ba8
+d7f6e98efe83207f1319e5b55305413c9d35f0072f5b1e04c1e0a6818339d564
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.