diff for duplicates of <1426893517-2511-18-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/1.txt b/N1/1.txt
index daa5f3e..07608a1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,7 +37,7 @@ index d79a0ac..191156b 100644
* region already (FIXME) */
request_region(0x3c0, 32, "vesafb");
-+ if (mtrr == 3) {
++ if (mtrr = 3) {
#ifdef CONFIG_MTRR
- if (mtrr) {
unsigned int temp_size = size_total;
@@ -75,7 +75,7 @@ index d79a0ac..191156b 100644
- rc = mtrr_add(vesafb_fix.smem_start, temp_size,
- type, 1);
- temp_size >>= 1;
-- } while (temp_size >= PAGE_SIZE && rc == -EINVAL);
+- } while (temp_size >= PAGE_SIZE && rc = -EINVAL);
- }
- }
+ /* Try and find a power of two to add */
@@ -83,7 +83,7 @@ index d79a0ac..191156b 100644
+ rc = mtrr_add(vesafb_fix.smem_start, temp_size,
+ MTRR_TYPE_WRCOMB, 1);
+ temp_size >>= 1;
-+ } while (temp_size >= PAGE_SIZE && rc == -EINVAL);
++ } while (temp_size >= PAGE_SIZE && rc = -EINVAL);
#endif
-
- switch (mtrr) {
diff --git a/a/content_digest b/N1/content_digest
index 865c747..853c981 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v1 17/47] video: fbdev: vesafb: only support MTRR_TYPE_WRCOMB\0"
]
[
- "Date\0Fri, 20 Mar 2015 16:18:07 -0700\0"
+ "Date\0Fri, 20 Mar 2015 23:18:07 +0000\0"
]
[
"To\0luto\@amacapital.net",
@@ -81,7 +81,7 @@
" \t * region already (FIXME) */\n",
" \trequest_region(0x3c0, 32, \"vesafb\");\n",
" \n",
- "+\tif (mtrr == 3) {\n",
+ "+\tif (mtrr = 3) {\n",
" #ifdef CONFIG_MTRR\n",
"-\tif (mtrr) {\n",
" \t\tunsigned int temp_size = size_total;\n",
@@ -119,7 +119,7 @@
"-\t\t\t\trc = mtrr_add(vesafb_fix.smem_start, temp_size,\n",
"-\t\t\t\t\t type, 1);\n",
"-\t\t\t\ttemp_size >>= 1;\n",
- "-\t\t\t} while (temp_size >= PAGE_SIZE && rc == -EINVAL);\n",
+ "-\t\t\t} while (temp_size >= PAGE_SIZE && rc = -EINVAL);\n",
"-\t\t}\n",
"-\t}\n",
"+\t\t/* Try and find a power of two to add */\n",
@@ -127,7 +127,7 @@
"+\t\t\trc = mtrr_add(vesafb_fix.smem_start, temp_size,\n",
"+\t\t\t\t MTRR_TYPE_WRCOMB, 1);\n",
"+\t\t\ttemp_size >>= 1;\n",
- "+\t\t} while (temp_size >= PAGE_SIZE && rc == -EINVAL);\n",
+ "+\t\t} while (temp_size >= PAGE_SIZE && rc = -EINVAL);\n",
" #endif\n",
"-\t\n",
"-\tswitch (mtrr) {\n",
@@ -158,4 +158,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-2395c0e24910365c380e5464417f787e4bad99f0e1caf5b063f4d0042b148571
+f6dfb12471756ef91a7214250239f364ee92082902afb006a2b983f6a1ae3a35
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.