diff for duplicates of <20171011200603.27442-3-jack@suse.cz>
diff --git a/a/1.txt b/N1/1.txt
index fa85174..a19129e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,10 +15,4 @@ index 38f6ed954dde..55a9d2d109d9 100644
#define VM_FAULT_FALLBACK 0x0800 /* huge page fault failed, fall back to small */
#define VM_FAULT_DONE_COW 0x1000 /* ->fault has fully handled COW */
--#define VM_FAULT_HWPOISON_LARGE_MASK 0xf000 /* encodes hpage index for large hwpoison */
--
- #define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV | \
- VM_FAULT_HWPOISON | VM_FAULT_HWPOISON_LARGE | \
- VM_FAULT_FALLBACK)
---
-2.12.3
\ No newline at end of file
+-#define VM_FAULT_HWPOISON_LARGE_MASK 0xf000 /* encodes hpage index for large hwpoison */
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 697be1a..37f0483 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -47,13 +47,7 @@
" #define VM_FAULT_FALLBACK 0x0800\t/* huge page fault failed, fall back to small */\n",
" #define VM_FAULT_DONE_COW 0x1000\t/* ->fault has fully handled COW */\n",
" \n",
- "-#define VM_FAULT_HWPOISON_LARGE_MASK 0xf000 /* encodes hpage index for large hwpoison */\n",
- "-\n",
- " #define VM_FAULT_ERROR\t(VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV | \\\n",
- " \t\t\t VM_FAULT_HWPOISON | VM_FAULT_HWPOISON_LARGE | \\\n",
- " \t\t\t VM_FAULT_FALLBACK)\n",
- "-- \n",
- "2.12.3"
+ "-#define VM_FAULT_HWPOISON_LARGE_MASK 0xf000 /* encodes hpage index for large hwpoison */"
]
-ff7670451ce97d6ce014188d7276801682e2fa427659db22ff2205e751b81a9c
+8d93f57c6a19232fa885eb94a425a45f1e7693dbadc2bb380fe64aa34cd1c4f3
diff --git a/a/content_digest b/N2/content_digest
index 697be1a..881b682 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -11,11 +11,11 @@
"Date\0Wed, 11 Oct 2017 22:05:46 +0200\0"
]
[
- "To\0<linux-fsdevel\@vger.kernel.org>\0"
+ "To\0linux-fsdevel\@vger.kernel.org\0"
]
[
- "Cc\0<linux-ext4\@vger.kernel.org>",
- " <linux-xfs\@vger.kernel.org>",
+ "Cc\0linux-ext4\@vger.kernel.org",
+ " linux-xfs\@vger.kernel.org",
" Christoph Hellwig <hch\@infradead.org>",
" Dan Williams <dan.j.williams\@intel.com>",
" Ross Zwisler <ross.zwisler\@linux.intel.com>",
@@ -56,4 +56,4 @@
"2.12.3"
]
-ff7670451ce97d6ce014188d7276801682e2fa427659db22ff2205e751b81a9c
+a605c54454c099cad1c49cc028ba8c7aa041cd472ceff87ae2024d29c835819c
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.