diff for duplicates of <1450637228.3430.30.camel@perches.com>
diff --git a/a/1.txt b/N1/1.txt
index 7322ab3..08842e5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,4 +13,9 @@ through to find this sort of error?
> + return false;
> }
>
-> return true;
\ No newline at end of file
+> return true;
+
+--
+To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0e393bb..58922d7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0Re: [patch -next] ath9k: fix ath9k_hw_nvram_check_version()\0"
]
[
- "Date\0Sun, 20 Dec 2015 10:47:08 -0800\0"
+ "Date\0Sun, 20 Dec 2015 18:47:08 +0000\0"
]
[
"To\0Dan Carpenter <dan.carpenter\@oracle.com>",
@@ -43,7 +43,12 @@
"> +\t\treturn false;\n",
"> \302\240\t}\n",
"> \302\240\n",
- "> \302\240\treturn true;"
+ "> \302\240\treturn true;\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe kernel-janitors\" in\n",
+ "the body of a message to majordomo\@vger.kernel.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-fd556a25643d53a8bc2a01bee6fd1e30412c1545f241c8f0a811e748da9f07b3
+85a5962ed2d1b0e27cdbed25145a5d1e66f95da12048104c0f5dd81d32b86501
diff --git a/a/1.txt b/N2/1.txt
index 7322ab3..d6454a6 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -6,11 +6,11 @@ through to find this sort of error?
> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c
> @@ -206,7 +206,7 @@ bool ath9k_hw_nvram_check_version(struct ath_hw *ah, int version, int minrev)
-> ath_err(common, "Bad EEPROM VER 0x%04x or REV 0x%04x\n",
-> ah->eep_ops->get_eeprom_ver(ah),
-> ah->eep_ops->get_eeprom_rev(ah));
+> ? ath_err(common, "Bad EEPROM VER 0x%04x or REV 0x%04x\n",
+> ? ah->eep_ops->get_eeprom_ver(ah),
+> ? ah->eep_ops->get_eeprom_rev(ah));
> - return -EINVAL;
> + return false;
-> }
->
-> return true;
\ No newline at end of file
+> ? }
+> ?
+> ? return true;
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 0e393bb..f4530b3 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,21 +5,13 @@
"From\0Joe Perches <joe\@perches.com>\0"
]
[
- "Subject\0Re: [patch -next] ath9k: fix ath9k_hw_nvram_check_version()\0"
+ "Subject\0[ath9k-devel] [patch -next] ath9k: fix ath9k_hw_nvram_check_version()\0"
]
[
"Date\0Sun, 20 Dec 2015 10:47:08 -0800\0"
]
[
- "To\0Dan Carpenter <dan.carpenter\@oracle.com>",
- " QCA ath9k Development <ath9k-devel\@qca.qualcomm.com>",
- " Martin Blumenstingl <martin.blumenstingl\@googlemail.com>\0"
-]
-[
- "Cc\0Kalle Valo <kvalo\@codeaurora.org>",
- " linux-wireless\@vger.kernel.org",
- " ath9k-devel\@venema.h4ckr.net",
- " kernel-janitors\@vger.kernel.org\0"
+ "To\0ath9k-devel\@lists.ath9k.org\0"
]
[
"\0000:1\0"
@@ -36,14 +28,14 @@
"\n",
"> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c\n",
"> \@\@ -206,7 +206,7 \@\@ bool ath9k_hw_nvram_check_version(struct ath_hw *ah, int version, int minrev)\n",
- "> \302\240\t\tath_err(common, \"Bad EEPROM VER 0x%04x or REV 0x%04x\\n\",\n",
- "> \302\240\t\t\tah->eep_ops->get_eeprom_ver(ah),\n",
- "> \302\240\t\t\tah->eep_ops->get_eeprom_rev(ah));\n",
+ "> ?\t\tath_err(common, \"Bad EEPROM VER 0x%04x or REV 0x%04x\\n\",\n",
+ "> ?\t\t\tah->eep_ops->get_eeprom_ver(ah),\n",
+ "> ?\t\t\tah->eep_ops->get_eeprom_rev(ah));\n",
"> -\t\treturn -EINVAL;\n",
"> +\t\treturn false;\n",
- "> \302\240\t}\n",
- "> \302\240\n",
- "> \302\240\treturn true;"
+ "> ?\t}\n",
+ "> ?\n",
+ "> ?\treturn true;"
]
-fd556a25643d53a8bc2a01bee6fd1e30412c1545f241c8f0a811e748da9f07b3
+c30721d6c2643784e96f85d7c2ea5c7881a947ed73d2009982fa2bc6a1be3f1a
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.