diff for duplicates of <1430425520-22275-7-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/content_digest b/N1/content_digest
index 4be7d8d..cfbec53 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -46,7 +46,17 @@
" Davidlohr Bueso <dbueso\@suse.de>",
" Dave Hansen <dave.hansen\@linux.intel.com>",
" Arnd Bergmann <arnd\@arndb.de>",
- " Stefan Bader <stefan.>\0"
+ " Stefan Bader <stefan.bader\@canonical.com>",
+ " konrad.wilk\@oracle.com",
+ " ville.syrjala\@linux.intel.com",
+ " david.vrabel\@citrix.com",
+ " jbeulich\@suse.com",
+ " toshi.kani\@hp.com",
+ " Roger Pau Monn\303\251 <roger.pau\@citrix.com>",
+ " infinipath\@intel.com",
+ " linux-rdma\@vger.kernel.org",
+ " linux-fbdev\@vger.kernel.org",
+ " xen-devel\@lists.xensource.com\0"
]
[
"\0000:1\0"
@@ -272,4 +282,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-8300d8e3444880d402de0ee9c76382c1c79119392435c5702628c4baa418ee29
+a6351e52f2283ab441d6fcf24d66f983a072679d2d698e3a710fb4047ad1b374
diff --git a/a/1.txt b/N2/1.txt
index 5081724..66925e3 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -186,7 +186,7 @@ index 70c1f3a..7b6e4c8 100644
+ if (dd->wc_cookie < 0) {
+ ipath_dev_err(dd, "Seting mtrr failed on PIO buffers\n");
+ ret = -ENODEV;
-+ } else if (dd->wc_cookie == 0)
++ } else if (dd->wc_cookie = 0)
+ ipath_cdbg(VERBOSE, "Set mtrr for chip to WC not needed\n");
+ else
+ ipath_cdbg(VERBOSE, "Set mtrr for chip to WC\n");
diff --git a/a/content_digest b/N2/content_digest
index 4be7d8d..0c4b749 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v5 6/6] IB/ipath: use arch_phys_wc_add() and require PAT disabled\0"
]
[
- "Date\0Thu, 30 Apr 2015 13:25:20 -0700\0"
+ "Date\0Thu, 30 Apr 2015 20:25:20 +0000\0"
]
[
"To\0bp\@suse.de",
@@ -243,7 +243,7 @@
"+\t\tif (dd->wc_cookie < 0) {\n",
"+\t\t\tipath_dev_err(dd, \"Seting mtrr failed on PIO buffers\\n\");\n",
"+\t\t\tret = -ENODEV;\n",
- "+\t\t} else if (dd->wc_cookie == 0)\n",
+ "+\t\t} else if (dd->wc_cookie = 0)\n",
"+\t\t\tipath_cdbg(VERBOSE, \"Set mtrr for chip to WC not needed\\n\");\n",
"+\t\telse\n",
"+\t\t\tipath_cdbg(VERBOSE, \"Set mtrr for chip to WC\\n\");\n",
@@ -272,4 +272,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-8300d8e3444880d402de0ee9c76382c1c79119392435c5702628c4baa418ee29
+78d641a4f9050d417561e12d4bb632c40310608af8e36c33385102526008cac9
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.