diff for duplicates of <36620233.VbNiGUfDRt@avalon> diff --git a/a/1.txt b/N1/1.txt index 98c1399..d8cb4cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,12 +39,12 @@ you like to handle the conflict ? > 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 f6b4fc7..330915a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0E1Ye59O-0001BJ-Gq@rmk-PC.arm.linux.org.uk\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 07/14] media: omap3isp: remove unused clkdev\0" - "Date\0Sat, 04 Apr 2015 00:44:35 +0300\0" + "Date\0Fri, 03 Apr 2015 21:44:35 +0000\0" "To\0Russell King <rmk+kernel@arm.linux.org.uk>\0" "Cc\0alsa-devel@alsa-project.org" linux-arm-kernel@lists.infradead.org @@ -54,12 +54,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" @@ -117,4 +117,4 @@ "\n" Laurent Pinchart -13bff18ca6a6f8f4bd06b596db441b134f7fcf94aa03688e5a7d78285836c2b7 +571979d467a1a8e263f89a518d6f97695d1a8875996020d74fa046d3b3a7a22a
diff --git a/a/content_digest b/N2/content_digest index f6b4fc7..68f548b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,9 @@ "ref\020150403171149.GC13898@n2100.arm.linux.org.uk\0" "ref\0E1Ye59O-0001BJ-Gq@rmk-PC.arm.linux.org.uk\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 07/14] media: omap3isp: remove unused clkdev\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 07/14] media: omap3isp: remove unused clkdev\0" "Date\0Sat, 04 Apr 2015 00:44:35 +0300\0" - "To\0Russell King <rmk+kernel@arm.linux.org.uk>\0" - "Cc\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 - Mauro Carvalho Chehab <mchehab@osg.samsung.com> - " sakari.ailus@iki.fi\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Russell,\n" @@ -117,4 +110,4 @@ "\n" Laurent Pinchart -13bff18ca6a6f8f4bd06b596db441b134f7fcf94aa03688e5a7d78285836c2b7 +15f1c8626e86bb2937de70295862e0c2873fdcb531f30db9fe59b1e2c467092d
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.