diff for duplicates of <20200214154854.6746-481-sashal@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 92a8c26..cb549fe 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,7 +12,7 @@ memory when the framebuffer size is greater than 4MB. For size under
 To enable framebuffer memory allocation from CMA, supply a kernel
 parameter to give enough space to CMA allocator at boot time. For
 example:
-    cma\x130m
+    cma=130m
 This gives 130MB memory to CAM allocator that can be allocated to
 framebuffer. If this fails, we fall back to the old way of using
 mmio for framebuffer.
@@ -52,7 +52,7 @@ index 4cd27e5172a16..8cf39d98b2bdf 100644
 + * This requires to allocate contiguous physical memory from Linux kernel's
 + * CMA memory allocator. To enable this, supply a kernel parameter to give
 + * enough memory space to CMA allocator for framebuffer. For example:
-+ *    cma\x130m
++ *    cma=130m
 + * This gives 130MB memory to CMA allocator that can be allocated to
 + * framebuffer. For reference, 8K resolution (7680x4320) takes about
 + * 127MB memory.
@@ -139,7 +139,7 @@ index 4cd27e5172a16..8cf39d98b2bdf 100644
 +	phys_addr_t paddr = 0;
 +	unsigned int order = get_order(request_size);
 +
-+	if (request_size = 0)
++	if (request_size == 0)
 +		return -1;
 +
 +	if (order < MAX_ORDER) {
@@ -192,7 +192,8 @@ index 4cd27e5172a16..8cf39d98b2bdf 100644
 +	phys_addr_t paddr;
  	int ret;
  
--	dio_fb_size -		screen_width * screen_height * screen_depth / 8;
+-	dio_fb_size =
+-		screen_width * screen_height * screen_depth / 8;
 +	info->apertures = alloc_apertures(1);
 +	if (!info->apertures)
 +		return -ENOMEM;
@@ -243,7 +244,8 @@ index 4cd27e5172a16..8cf39d98b2bdf 100644
 +	 * Cannot use the contiguous physical memory.
 +	 * Allocate mmio space for framebuffer.
 +	 */
-+	dio_fb_size +		screen_width * screen_height * screen_depth / 8;
++	dio_fb_size =
++		screen_width * screen_height * screen_depth / 8;
 +
 +	if (gen2vm) {
 +		pot_start = 0;
@@ -253,7 +255,7 @@ index 4cd27e5172a16..8cf39d98b2bdf 100644
  		    pci_resource_len(pdev, 0) < screen_fb_size) {
  			pr_err("Resource not available or (0x%lx < 0x%lx)\n",
 @@ -993,20 +1101,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
- 	if (par->dio_vp = NULL)
+ 	if (par->dio_vp == NULL)
  		goto err3;
  
 -	info->apertures = alloc_apertures(1);
diff --git a/a/content_digest b/N1/content_digest
index 425a03d..d55963c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,16 @@
  "ref\020200214154854.6746-1-sashal@kernel.org\0"
  "From\0Sasha Levin <sashal@kernel.org>\0"
- "Subject\0[PATCH AUTOSEL 5.5 481/542] video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs\0"
- "Date\0Fri, 14 Feb 2020 15:47:53 +0000\0"
+ "Subject\0[PATCH AUTOSEL 5.5 481/542] video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.\0"
+ "Date\0Fri, 14 Feb 2020 10:47:53 -0500\0"
  "To\0linux-kernel@vger.kernel.org"
  " stable@vger.kernel.org\0"
- "Cc\0Sasha Levin <sashal@kernel.org>"
-  linux-fbdev@vger.kernel.org
-  Wei Hu <weh@microsoft.com>
+ "Cc\0Wei Hu <weh@microsoft.com>"
   kbuild test robot <lkp@intel.com>
   Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-  linux-hyperv@vger.kernel.org
- " dri-devel@lists.freedesktop.org\0"
+  Sasha Levin <sashal@kernel.org>
+  dri-devel@lists.freedesktop.org
+  linux-fbdev@vger.kernel.org
+ " linux-hyperv@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "From: Wei Hu <weh@microsoft.com>\n"
@@ -27,7 +27,7 @@
  "To enable framebuffer memory allocation from CMA, supply a kernel\n"
  "parameter to give enough space to CMA allocator at boot time. For\n"
  "example:\n"
- "    cma\0230m\n"
+ "    cma=130m\n"
  "This gives 130MB memory to CAM allocator that can be allocated to\n"
  "framebuffer. If this fails, we fall back to the old way of using\n"
  "mmio for framebuffer.\n"
@@ -67,7 +67,7 @@
  "+ * This requires to allocate contiguous physical memory from Linux kernel's\n"
  "+ * CMA memory allocator. To enable this, supply a kernel parameter to give\n"
  "+ * enough memory space to CMA allocator for framebuffer. For example:\n"
- "+ *    cma\0230m\n"
+ "+ *    cma=130m\n"
  "+ * This gives 130MB memory to CMA allocator that can be allocated to\n"
  "+ * framebuffer. For reference, 8K resolution (7680x4320) takes about\n"
  "+ * 127MB memory.\n"
@@ -154,7 +154,7 @@
  "+\tphys_addr_t paddr = 0;\n"
  "+\tunsigned int order = get_order(request_size);\n"
  "+\n"
- "+\tif (request_size = 0)\n"
+ "+\tif (request_size == 0)\n"
  "+\t\treturn -1;\n"
  "+\n"
  "+\tif (order < MAX_ORDER) {\n"
@@ -207,7 +207,8 @@
  "+\tphys_addr_t paddr;\n"
  " \tint ret;\n"
  " \n"
- "-\tdio_fb_size -\t\tscreen_width * screen_height * screen_depth / 8;\n"
+ "-\tdio_fb_size =\n"
+ "-\t\tscreen_width * screen_height * screen_depth / 8;\n"
  "+\tinfo->apertures = alloc_apertures(1);\n"
  "+\tif (!info->apertures)\n"
  "+\t\treturn -ENOMEM;\n"
@@ -258,7 +259,8 @@
  "+\t * Cannot use the contiguous physical memory.\n"
  "+\t * Allocate mmio space for framebuffer.\n"
  "+\t */\n"
- "+\tdio_fb_size +\t\tscreen_width * screen_height * screen_depth / 8;\n"
+ "+\tdio_fb_size =\n"
+ "+\t\tscreen_width * screen_height * screen_depth / 8;\n"
  "+\n"
  "+\tif (gen2vm) {\n"
  "+\t\tpot_start = 0;\n"
@@ -268,7 +270,7 @@
  " \t\t    pci_resource_len(pdev, 0) < screen_fb_size) {\n"
  " \t\t\tpr_err(\"Resource not available or (0x%lx < 0x%lx)\\n\",\n"
  "@@ -993,20 +1101,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)\n"
- " \tif (par->dio_vp = NULL)\n"
+ " \tif (par->dio_vp == NULL)\n"
  " \t\tgoto err3;\n"
  " \n"
  "-\tinfo->apertures = alloc_apertures(1);\n"
@@ -365,4 +367,4 @@
  "-- \n"
  2.20.1
 
-5f63c8c4697bf3e59f6cc1bb9b8322fec930b1919fb19012c72b014670de2894
+12344f453e5e7a3bd25b88699b9971bcbbefbf968154b9f99d65aaca43081175
