diff for duplicates of <f92f41b1-d4fa-4ffa-8c19-af4eb0d2d8cf@users.sourceforge.net>

diff --git a/a/1.txt b/N1/1.txt
index 217a63a..94544c4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,35 +1,21 @@
-From: Markus Elfring <elfring@users.sourceforge.net>
-Date: Sun, 7 Jan 2018 12:34:22 +0100
-
-Omit an extra message for a memory allocation failure in this function.
-
-This issue was detected by using the Coccinelle software.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
----
-
-v2:
-This update suggestion was rebased on source files from the software
-"Linux next-20180105" together with a change for an error code.
-
- drivers/video/fbdev/stifb.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
-index 511a594889af..dec8efb4f256 100644
---- a/drivers/video/fbdev/stifb.c
-+++ b/drivers/video/fbdev/stifb.c
-@@ -1126,10 +1126,8 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
- 	int bpp, xres, yres;
- 
- 	fb = kzalloc(sizeof(*fb), GFP_ATOMIC);
--	if (!fb) {
--		printk(KERN_ERR "stifb: Could not allocate stifb structure\n");
-+	if (!fb)
- 		return -ENOMEM;
--	}
- 	
- 	info = &fb->info;
- 
--- 
-2.15.1
+RnJvbTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRl
+OiBTdW4sIDcgSmFuIDIwMTggMTI6MzQ6MjIgKzAxMDAKCk9taXQgYW4gZXh0cmEgbWVzc2FnZSBm
+b3IgYSBtZW1vcnkgYWxsb2NhdGlvbiBmYWlsdXJlIGluIHRoaXMgZnVuY3Rpb24uCgpUaGlzIGlz
+c3VlIHdhcyBkZXRlY3RlZCBieSB1c2luZyB0aGUgQ29jY2luZWxsZSBzb2Z0d2FyZS4KClNpZ25l
+ZC1vZmYtYnk6IE1hcmt1cyBFbGZyaW5nIDxlbGZyaW5nQHVzZXJzLnNvdXJjZWZvcmdlLm5ldD4K
+LS0tCgp2MjoKVGhpcyB1cGRhdGUgc3VnZ2VzdGlvbiB3YXMgcmViYXNlZCBvbiBzb3VyY2UgZmls
+ZXMgZnJvbSB0aGUgc29mdHdhcmUKIkxpbnV4IG5leHQtMjAxODAxMDUiIHRvZ2V0aGVyIHdpdGgg
+YSBjaGFuZ2UgZm9yIGFuIGVycm9yIGNvZGUuCgogZHJpdmVycy92aWRlby9mYmRldi9zdGlmYi5j
+IHwgNCArLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRpb25zKC0p
+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9zdGlmYi5jIGIvZHJpdmVycy92aWRl
+by9mYmRldi9zdGlmYi5jCmluZGV4IDUxMWE1OTQ4ODlhZi4uZGVjOGVmYjRmMjU2IDEwMDY0NAot
+LS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3N0aWZiLmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRl
+di9zdGlmYi5jCkBAIC0xMTI2LDEwICsxMTI2LDggQEAgc3RhdGljIGludCBfX2luaXQgc3RpZmJf
+aW5pdF9mYihzdHJ1Y3Qgc3RpX3N0cnVjdCAqc3RpLCBpbnQgYnBwX3ByZWYpCiAJaW50IGJwcCwg
+eHJlcywgeXJlczsKIAogCWZiID0ga3phbGxvYyhzaXplb2YoKmZiKSwgR0ZQX0FUT01JQyk7Ci0J
+aWYgKCFmYikgewotCQlwcmludGsoS0VSTl9FUlIgInN0aWZiOiBDb3VsZCBub3QgYWxsb2NhdGUg
+c3RpZmIgc3RydWN0dXJlXG4iKTsKKwlpZiAoIWZiKQogCQlyZXR1cm4gLUVOT01FTTsKLQl9CiAJ
+CiAJaW5mbyA9ICZmYi0+aW5mbzsKIAotLSAKMi4xNS4xCgpfX19fX19fX19fX19fX19fX19fX19f
+X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl
+bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp
+bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK
diff --git a/a/content_digest b/N1/content_digest
index f5d87d8..0b20820 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "ref\01680261.Msdj7gi9fB@amdc3058\0"
  "ref\0889131fe-199c-3bef-0781-00761b807426@users.sourceforge.net\0"
  "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0"
- "Subject\0[PATCH v2 2/2] video/fbdev/stifb: Delete an error message for a failed memory allocation in stifb_in\0"
- "Date\0Sun, 07 Jan 2018 11:58:47 +0000\0"
+ "Subject\0[PATCH v2 2/2] video/fbdev/stifb: Delete an error message for a failed memory allocation in stifb_init_fb()\0"
+ "Date\0Sun, 7 Jan 2018 12:58:47 +0100\0"
  "To\0linux-fbdev@vger.kernel.org"
   linux-parisc@vger.kernel.org
   dri-devel@lists.freedesktop.org
@@ -17,40 +17,26 @@
  " LKML <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
- "From: Markus Elfring <elfring@users.sourceforge.net>\n"
- "Date: Sun, 7 Jan 2018 12:34:22 +0100\n"
- "\n"
- "Omit an extra message for a memory allocation failure in this function.\n"
- "\n"
- "This issue was detected by using the Coccinelle software.\n"
- "\n"
- "Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>\n"
- "---\n"
- "\n"
- "v2:\n"
- "This update suggestion was rebased on source files from the software\n"
- "\"Linux next-20180105\" together with a change for an error code.\n"
- "\n"
- " drivers/video/fbdev/stifb.c | 4 +---\n"
- " 1 file changed, 1 insertion(+), 3 deletions(-)\n"
- "\n"
- "diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c\n"
- "index 511a594889af..dec8efb4f256 100644\n"
- "--- a/drivers/video/fbdev/stifb.c\n"
- "+++ b/drivers/video/fbdev/stifb.c\n"
- "@@ -1126,10 +1126,8 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)\n"
- " \tint bpp, xres, yres;\n"
- " \n"
- " \tfb = kzalloc(sizeof(*fb), GFP_ATOMIC);\n"
- "-\tif (!fb) {\n"
- "-\t\tprintk(KERN_ERR \"stifb: Could not allocate stifb structure\\n\");\n"
- "+\tif (!fb)\n"
- " \t\treturn -ENOMEM;\n"
- "-\t}\n"
- " \t\n"
- " \tinfo = &fb->info;\n"
- " \n"
- "-- \n"
- 2.15.1
+ "RnJvbTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRl\n"
+ "OiBTdW4sIDcgSmFuIDIwMTggMTI6MzQ6MjIgKzAxMDAKCk9taXQgYW4gZXh0cmEgbWVzc2FnZSBm\n"
+ "b3IgYSBtZW1vcnkgYWxsb2NhdGlvbiBmYWlsdXJlIGluIHRoaXMgZnVuY3Rpb24uCgpUaGlzIGlz\n"
+ "c3VlIHdhcyBkZXRlY3RlZCBieSB1c2luZyB0aGUgQ29jY2luZWxsZSBzb2Z0d2FyZS4KClNpZ25l\n"
+ "ZC1vZmYtYnk6IE1hcmt1cyBFbGZyaW5nIDxlbGZyaW5nQHVzZXJzLnNvdXJjZWZvcmdlLm5ldD4K\n"
+ "LS0tCgp2MjoKVGhpcyB1cGRhdGUgc3VnZ2VzdGlvbiB3YXMgcmViYXNlZCBvbiBzb3VyY2UgZmls\n"
+ "ZXMgZnJvbSB0aGUgc29mdHdhcmUKIkxpbnV4IG5leHQtMjAxODAxMDUiIHRvZ2V0aGVyIHdpdGgg\n"
+ "YSBjaGFuZ2UgZm9yIGFuIGVycm9yIGNvZGUuCgogZHJpdmVycy92aWRlby9mYmRldi9zdGlmYi5j\n"
+ "IHwgNCArLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRpb25zKC0p\n"
+ "CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9zdGlmYi5jIGIvZHJpdmVycy92aWRl\n"
+ "by9mYmRldi9zdGlmYi5jCmluZGV4IDUxMWE1OTQ4ODlhZi4uZGVjOGVmYjRmMjU2IDEwMDY0NAot\n"
+ "LS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3N0aWZiLmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRl\n"
+ "di9zdGlmYi5jCkBAIC0xMTI2LDEwICsxMTI2LDggQEAgc3RhdGljIGludCBfX2luaXQgc3RpZmJf\n"
+ "aW5pdF9mYihzdHJ1Y3Qgc3RpX3N0cnVjdCAqc3RpLCBpbnQgYnBwX3ByZWYpCiAJaW50IGJwcCwg\n"
+ "eHJlcywgeXJlczsKIAogCWZiID0ga3phbGxvYyhzaXplb2YoKmZiKSwgR0ZQX0FUT01JQyk7Ci0J\n"
+ "aWYgKCFmYikgewotCQlwcmludGsoS0VSTl9FUlIgInN0aWZiOiBDb3VsZCBub3QgYWxsb2NhdGUg\n"
+ "c3RpZmIgc3RydWN0dXJlXG4iKTsKKwlpZiAoIWZiKQogCQlyZXR1cm4gLUVOT01FTTsKLQl9CiAJ\n"
+ "CiAJaW5mbyA9ICZmYi0+aW5mbzsKIAotLSAKMi4xNS4xCgpfX19fX19fX19fX19fX19fX19fX19f\n"
+ "X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl\n"
+ "bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp\n"
+ bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK
 
-1273e7a3b17ac16c07fad75bfbc6f45bc7d4787f2c7d4183280986c7cb3e89a0
+93f8bf6bc1674077cb9e87275c736265a35e88a39302502f7193bfd952517187
