diff for duplicates of <YA6FMboLhnE3uSvb@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 659bc95..7cd2b78 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index eb997f4678de..3f603a6b5f90 100644
  				      fifo_size,
  				      MEMREMAP_WB);
  
--	if (unlikely(dev->fifo_mem = NULL)) {
+-	if (unlikely(dev->fifo_mem == NULL)) {
 +	if (IS_ERR(dev->fifo_mem)) {
  		DRM_ERROR("Failed mapping FIFO memory.\n");
 -		return -ENOMEM;
@@ -27,3 +27,8 @@ index eb997f4678de..3f603a6b5f90 100644
  	/*
 -- 
 2.29.2
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 74144b7..24e1944 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/vmwgfx/vmwgfx_drv: Fix an error path in vmw_setup_pci_resources()\0"
- "Date\0Mon, 25 Jan 2021 08:45:37 +0000\0"
+ "Date\0Mon, 25 Jan 2021 11:45:37 +0300\0"
  "To\0VMware Graphics <linux-graphics-maintainer@vmware.com>"
  " Zack Rusin <zackr@vmware.com>\0"
  "Cc\0David Airlie <airlied@linux.ie>"
@@ -28,7 +28,7 @@
  " \t\t\t\t      fifo_size,\n"
  " \t\t\t\t      MEMREMAP_WB);\n"
  " \n"
- "-\tif (unlikely(dev->fifo_mem = NULL)) {\n"
+ "-\tif (unlikely(dev->fifo_mem == NULL)) {\n"
  "+\tif (IS_ERR(dev->fifo_mem)) {\n"
  " \t\tDRM_ERROR(\"Failed mapping FIFO memory.\\n\");\n"
  "-\t\treturn -ENOMEM;\n"
@@ -38,6 +38,11 @@
  " \n"
  " \t/*\n"
  "-- \n"
- 2.29.2
+ "2.29.2\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-9ff309a64477f2926cf707fd0119bfba4ea5ca6b0d5c336467224a5fb6489a0f
+cab56a6d7f110868c3edb90198836057f590eb2d5328f19a5ac6315f1e4d3ba9
