diff for duplicates of <20150318082158.GB10434@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 901ebb9..3b78981 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,15 +14,19 @@ index f1b9ea6..cbf013f 100644
  		      const struct i915_ggtt_view *ggtt_view)
  {
 -	struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL);
--	if (vma = NULL)
+-	if (vma == NULL)
 -		return ERR_PTR(-ENOMEM);
 +	struct i915_vma *vma;
  
  	if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view))
  		return ERR_PTR(-EINVAL);
 +	vma = kzalloc(sizeof(*vma), GFP_KERNEL);
-+	if (vma = NULL)
++	if (vma == NULL)
 +		return ERR_PTR(-ENOMEM);
  
  	INIT_LIST_HEAD(&vma->vma_link);
  	INIT_LIST_HEAD(&vma->mm_list);
+_______________________________________________
+Intel-gfx mailing list
+Intel-gfx@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index 1b35d63..f1fea33 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/i915: memory leak in __i915_gem_vma_create()\0"
- "Date\0Wed, 18 Mar 2015 08:21:58 +0000\0"
+ "Date\0Wed, 18 Mar 2015 11:21:58 +0300\0"
  "To\0Daniel Vetter <daniel.vetter@intel.com>"
  " Joonas Lahtinen <joonas.lahtinen@linux.intel.com>\0"
  "Cc\0David Airlie <airlied@linux.ie>"
@@ -25,17 +25,21 @@
  " \t\t      const struct i915_ggtt_view *ggtt_view)\n"
  " {\n"
  "-\tstruct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL);\n"
- "-\tif (vma = NULL)\n"
+ "-\tif (vma == NULL)\n"
  "-\t\treturn ERR_PTR(-ENOMEM);\n"
  "+\tstruct i915_vma *vma;\n"
  " \n"
  " \tif (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view))\n"
  " \t\treturn ERR_PTR(-EINVAL);\n"
  "+\tvma = kzalloc(sizeof(*vma), GFP_KERNEL);\n"
- "+\tif (vma = NULL)\n"
+ "+\tif (vma == NULL)\n"
  "+\t\treturn ERR_PTR(-ENOMEM);\n"
  " \n"
  " \tINIT_LIST_HEAD(&vma->vma_link);\n"
- " \tINIT_LIST_HEAD(&vma->mm_list);"
+ " \tINIT_LIST_HEAD(&vma->mm_list);\n"
+ "_______________________________________________\n"
+ "Intel-gfx mailing list\n"
+ "Intel-gfx@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/intel-gfx
 
-ec8d09c50ec687ff4b4613230a2e2cbc83bed641b515edd2b99911ef3b14e320
+c7b8c8c3a02badbaa8e90c23444296bb5241629c608f2018c92202ecbc842252
