diff for duplicates of <E1Ye59O-0001BJ-Gq@rmk-PC.arm.linux.org.uk>
diff --git a/a/1.txt b/N1/1.txt
index d94a5af..23f6764 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,12 +26,12 @@ index deca80903c3a..4d8078b9d010 100644
if (IS_ERR(xclk->clk))
return PTR_ERR(xclk->clk);
-
-- if (pdata->xclks[i].con_id = NULL &&
-- pdata->xclks[i].dev_id = NULL)
+- if (pdata->xclks[i].con_id == NULL &&
+- pdata->xclks[i].dev_id == NULL)
- continue;
-
- xclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);
-- if (xclk->lookup = NULL)
+- if (xclk->lookup == NULL)
- return -ENOMEM;
-
- xclk->lookup->con_id = pdata->xclks[i].con_id;
diff --git a/a/content_digest b/N1/content_digest
index 9265ec2..a56c26d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 07/14] media: omap3isp: remove unused clkdev\0"
]
[
- "Date\0Fri, 03 Apr 2015 17:12:58 +0000\0"
+ "Date\0Fri, 03 Apr 2015 18:12:58 +0100\0"
]
[
"To\0alsa-devel\@alsa-project.org",
@@ -56,12 +56,12 @@
" \t\tif (IS_ERR(xclk->clk))\n",
" \t\t\treturn PTR_ERR(xclk->clk);\n",
"-\n",
- "-\t\tif (pdata->xclks[i].con_id = NULL &&\n",
- "-\t\t pdata->xclks[i].dev_id = NULL)\n",
+ "-\t\tif (pdata->xclks[i].con_id == NULL &&\n",
+ "-\t\t pdata->xclks[i].dev_id == NULL)\n",
"-\t\t\tcontinue;\n",
"-\n",
"-\t\txclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);\n",
- "-\t\tif (xclk->lookup = NULL)\n",
+ "-\t\tif (xclk->lookup == NULL)\n",
"-\t\t\treturn -ENOMEM;\n",
"-\n",
"-\t\txclk->lookup->con_id = pdata->xclks[i].con_id;\n",
@@ -116,4 +116,4 @@
"1.8.3.1"
]
-072ce234928f19a844c5333ee2cc4235e4cc5600decdf67fb81250cbeb9b9c7f
+85280695d7b49469b49ebec47d390265a5001ada6a2a9cb7554692d5e0919a06
diff --git a/a/1.txt b/N2/1.txt
index d94a5af..23f6764 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -26,12 +26,12 @@ index deca80903c3a..4d8078b9d010 100644
if (IS_ERR(xclk->clk))
return PTR_ERR(xclk->clk);
-
-- if (pdata->xclks[i].con_id = NULL &&
-- pdata->xclks[i].dev_id = NULL)
+- if (pdata->xclks[i].con_id == NULL &&
+- pdata->xclks[i].dev_id == NULL)
- continue;
-
- xclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);
-- if (xclk->lookup = NULL)
+- if (xclk->lookup == NULL)
- return -ENOMEM;
-
- xclk->lookup->con_id = pdata->xclks[i].con_id;
diff --git a/a/content_digest b/N2/content_digest
index 9265ec2..1b4d31a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,24 +2,16 @@
"ref\00020150403171149.GC13898\@n2100.arm.linux.org.uk\0"
]
[
- "From\0Russell King <rmk+kernel\@arm.linux.org.uk>\0"
+ "From\0rmk+kernel\@arm.linux.org.uk (Russell King)\0"
]
[
"Subject\0[PATCH 07/14] media: omap3isp: remove unused clkdev\0"
]
[
- "Date\0Fri, 03 Apr 2015 17:12:58 +0000\0"
+ "Date\0Fri, 03 Apr 2015 18:12:58 +0100\0"
]
[
- "To\0alsa-devel\@alsa-project.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-media\@vger.kernel.org",
- " linux-omap\@vger.kernel.org",
- " linux-sh\@vger.kernel.org\0"
-]
-[
- "Cc\0Laurent Pinchart <laurent.pinchart\@ideasonboard.com>",
- " Mauro Carvalho Chehab <mchehab\@osg.samsung.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -56,12 +48,12 @@
" \t\tif (IS_ERR(xclk->clk))\n",
" \t\t\treturn PTR_ERR(xclk->clk);\n",
"-\n",
- "-\t\tif (pdata->xclks[i].con_id = NULL &&\n",
- "-\t\t pdata->xclks[i].dev_id = NULL)\n",
+ "-\t\tif (pdata->xclks[i].con_id == NULL &&\n",
+ "-\t\t pdata->xclks[i].dev_id == NULL)\n",
"-\t\t\tcontinue;\n",
"-\n",
"-\t\txclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);\n",
- "-\t\tif (xclk->lookup = NULL)\n",
+ "-\t\tif (xclk->lookup == NULL)\n",
"-\t\t\treturn -ENOMEM;\n",
"-\n",
"-\t\txclk->lookup->con_id = pdata->xclks[i].con_id;\n",
@@ -116,4 +108,4 @@
"1.8.3.1"
]
-072ce234928f19a844c5333ee2cc4235e4cc5600decdf67fb81250cbeb9b9c7f
+86cef77dc9a12cd3d98e1bab2d36ab8b10bae27297f3b2a52dc9a63e46b2abd3
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.