diff for duplicates of <1426893517-2511-43-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/1.txt b/N1/1.txt
index deec348..d68ac0e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -143,8 +143,7 @@ index f761fe3..621fa44 100644
- default_par->mtrr_handle = -1;
if (!nomtrr)
-- default_par->mtrr_handle =
-- mtrr_add(info->fix.smem_start, info->fix.smem_len,
+- default_par->mtrr_handle - mtrr_add(info->fix.smem_start, info->fix.smem_len,
- MTRR_TYPE_WRCOMB, 1);
+ default_par->wc_cookie= arch_phys_wc_add(info->fix.smem_start,
+ info->fix.smem_len);
diff --git a/a/content_digest b/N1/content_digest
index 7ed15b6..bdf7026 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v1 42/47] video: fbdev: tdfxfb: use arch_phys_wc_add() and ioremap_wc()\0"
]
[
- "Date\0Fri, 20 Mar 2015 16:18:32 -0700\0"
+ "Date\0Fri, 20 Mar 2015 23:18:32 +0000\0"
]
[
"To\0luto\@amacapital.net",
@@ -186,8 +186,7 @@
" \n",
"-\tdefault_par->mtrr_handle = -1;\n",
" \tif (!nomtrr)\n",
- "-\t\tdefault_par->mtrr_handle =\n",
- "-\t\t\tmtrr_add(info->fix.smem_start, info->fix.smem_len,\n",
+ "-\t\tdefault_par->mtrr_handle -\t\t\tmtrr_add(info->fix.smem_start, info->fix.smem_len,\n",
"-\t\t\t\t MTRR_TYPE_WRCOMB, 1);\n",
"+\t\tdefault_par->wc_cookie= arch_phys_wc_add(info->fix.smem_start,\n",
"+\t\t\t\t\t\t\t info->fix.smem_len);\n",
@@ -255,4 +254,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-149057f02763368b25658a460e06d63bf9fcf57fa00c2d7fb03bf0255cd35653
+29fb3793dbdb983f78aa3714e6ba7bd79a0a10f92e2c6d13153d32b7f478b66a
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.