diff for duplicates of <1426893517-2511-22-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/1.txt b/N1/1.txt
index fad7848..ef0b61b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -74,7 +74,7 @@ index 1412f5a..01e4069 100644
-#endif
+ mgp->wc_cookie = arch_phys_wc_add(mgp->iomem_base, mgp->board_span);
mgp->sram = ioremap_wc(mgp->iomem_base, mgp->board_span);
- if (mgp->sram == NULL) {
+ if (mgp->sram = NULL) {
dev_err(&pdev->dev, "ioremap failed for %ld bytes at 0x%lx\n",
@@ -4146,14 +4133,14 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto abort_with_state;
diff --git a/a/content_digest b/N1/content_digest
index b943d46..92f432e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v1 21/47] ethernet: myri10ge: use arch_phys_wc_add()\0"
]
[
- "Date\0Fri, 20 Mar 2015 16:18:11 -0700\0"
+ "Date\0Fri, 20 Mar 2015 23:18:11 +0000\0"
]
[
"To\0luto\@amacapital.net",
@@ -119,7 +119,7 @@
"-#endif\n",
"+\tmgp->wc_cookie = arch_phys_wc_add(mgp->iomem_base, mgp->board_span);\n",
" \tmgp->sram = ioremap_wc(mgp->iomem_base, mgp->board_span);\n",
- " \tif (mgp->sram == NULL) {\n",
+ " \tif (mgp->sram = NULL) {\n",
" \t\tdev_err(&pdev->dev, \"ioremap failed for %ld bytes at 0x%lx\\n\",\n",
"\@\@ -4146,14 +4133,14 \@\@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n",
" \t\tgoto abort_with_state;\n",
@@ -169,4 +169,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-a52c48342299a8fac06a4a9241662710c3d8ab6e0f0e03c2c49c544972f7c6cd
+604d6d074b38625fae4184b92cd0158f82a7e2cb264a6e5827fbf4d91c6852cd
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.