diff for duplicates of <20150116104342.GA4860@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 0264025..460abae 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,9 +10,9 @@ index 8777b7f..28215e4 100644
  	for_each_sg(sgt->sgl, s, sgt->nents, i)
  		sg_dma_address(s) = sg_phys(s);
  
--	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) = 0) {
+-	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0) {
 -		sgt = ERR_PTR(-ENOMEM);
-+	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) = 0)
++	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0)
  		goto release_sgt;
 -	}
  
@@ -26,3 +26,7 @@ index 8777b7f..28215e4 100644
  put_pages:
  	drm_gem_put_pages(&bo->gem, bo->pages, false, false);
  	return PTR_ERR(sgt);
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index ca0d67c..3f48d3c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0[patch] drm/tegra: gem: oops in error handling\0"
- "Date\0Fri, 16 Jan 2015 10:43:42 +0000\0"
+ "Date\0Fri, 16 Jan 2015 13:43:42 +0300\0"
  "To\0Thierry Reding <thierry.reding@gmail.com>\0"
  "Cc\0Alexandre Courbot <gnurou@gmail.com>"
  " Terje Bergstr\303\266m <tbergstrom@nvidia.com>"
@@ -22,9 +22,9 @@
  " \tfor_each_sg(sgt->sgl, s, sgt->nents, i)\n"
  " \t\tsg_dma_address(s) = sg_phys(s);\n"
  " \n"
- "-\tif (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) = 0) {\n"
+ "-\tif (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0) {\n"
  "-\t\tsgt = ERR_PTR(-ENOMEM);\n"
- "+\tif (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) = 0)\n"
+ "+\tif (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0)\n"
  " \t\tgoto release_sgt;\n"
  "-\t}\n"
  " \n"
@@ -37,6 +37,10 @@
  "+\tsgt = ERR_PTR(-ENOMEM);\n"
  " put_pages:\n"
  " \tdrm_gem_put_pages(&bo->gem, bo->pages, false, false);\n"
- " \treturn PTR_ERR(sgt);"
+ " \treturn PTR_ERR(sgt);\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-f8befaa9a48b7068104ba4f1a57c110a7b0a7efd63bbdc560127b803fd37436e
+b10462410ca52d86d6fa2c479d43164a5ef4854fa062a9497dff8fc013c45bc9
