diff for duplicates of <20191112140431.7895-3-tzimmermann@suse.de>

diff --git a/a/1.txt b/N1/1.txt
index 4d8fe07..09ddf79 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -152,7 +152,7 @@ index f8153b726343..8fe4d8cf3212 100644
 -	ufbdev->fb_count++;
 -
 -#ifdef CONFIG_DRM_FBDEV_EMULATION
--	if (fb_defio && (info->fbdefio = NULL)) {
+-	if (fb_defio && (info->fbdefio == NULL)) {
 -		/* enable defio at last moment if not disabled by client */
 -
 -		struct fb_deferred_io *fbdefio;
@@ -186,7 +186,7 @@ index f8153b726343..8fe4d8cf3212 100644
 -	ufbdev->fb_count--;
 -
 -#ifdef CONFIG_DRM_FBDEV_EMULATION
--	if ((ufbdev->fb_count = 0) && (info->fbdefio)) {
+-	if ((ufbdev->fb_count == 0) && (info->fbdefio)) {
 -		fb_deferred_io_cleanup(info);
 -		kfree(info->fbdefio);
 -		info->fbdefio = NULL;
@@ -222,7 +222,8 @@ index f8153b726343..8fe4d8cf3212 100644
 -static int udlfb_create(struct drm_fb_helper *helper,
 -			struct drm_fb_helper_surface_size *sizes)
 -{
--	struct udl_fbdev *ufbdev -		container_of(helper, struct udl_fbdev, helper);
+-	struct udl_fbdev *ufbdev =
+-		container_of(helper, struct udl_fbdev, helper);
 -	struct drm_device *dev = ufbdev->helper.dev;
 -	struct fb_info *info;
 -	struct drm_framebuffer *fb;
@@ -232,7 +233,7 @@ index f8153b726343..8fe4d8cf3212 100644
 -	uint32_t size;
 -	int ret = 0;
 -
--	if (sizes->surface_bpp = 24)
+-	if (sizes->surface_bpp == 24)
 -		sizes->surface_bpp = 32;
 -
 -	mode_cmd.width = sizes->surface_width;
@@ -412,3 +413,8 @@ index 1f8ebcc595de..9b55958af238 100644
  int udl_modeset_init(struct drm_device *dev)
 -- 
 2.23.0
+
+_______________________________________________
+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 9260ff6..25cf987 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020191112140431.7895-1-tzimmermann@suse.de\0"
  "From\0Thomas Zimmermann <tzimmermann@suse.de>\0"
  "Subject\0[PATCH v3 2/5] drm/udl: Replace fbdev code with generic emulation\0"
- "Date\0Tue, 12 Nov 2019 14:04:28 +0000\0"
+ "Date\0Tue, 12 Nov 2019 15:04:28 +0100\0"
  "To\0airlied@redhat.com"
   sean@poorly.run
   daniel@ffwll.ch
@@ -169,7 +169,7 @@
  "-\tufbdev->fb_count++;\n"
  "-\n"
  "-#ifdef CONFIG_DRM_FBDEV_EMULATION\n"
- "-\tif (fb_defio && (info->fbdefio = NULL)) {\n"
+ "-\tif (fb_defio && (info->fbdefio == NULL)) {\n"
  "-\t\t/* enable defio at last moment if not disabled by client */\n"
  "-\n"
  "-\t\tstruct fb_deferred_io *fbdefio;\n"
@@ -203,7 +203,7 @@
  "-\tufbdev->fb_count--;\n"
  "-\n"
  "-#ifdef CONFIG_DRM_FBDEV_EMULATION\n"
- "-\tif ((ufbdev->fb_count = 0) && (info->fbdefio)) {\n"
+ "-\tif ((ufbdev->fb_count == 0) && (info->fbdefio)) {\n"
  "-\t\tfb_deferred_io_cleanup(info);\n"
  "-\t\tkfree(info->fbdefio);\n"
  "-\t\tinfo->fbdefio = NULL;\n"
@@ -239,7 +239,8 @@
  "-static int udlfb_create(struct drm_fb_helper *helper,\n"
  "-\t\t\tstruct drm_fb_helper_surface_size *sizes)\n"
  "-{\n"
- "-\tstruct udl_fbdev *ufbdev -\t\tcontainer_of(helper, struct udl_fbdev, helper);\n"
+ "-\tstruct udl_fbdev *ufbdev =\n"
+ "-\t\tcontainer_of(helper, struct udl_fbdev, helper);\n"
  "-\tstruct drm_device *dev = ufbdev->helper.dev;\n"
  "-\tstruct fb_info *info;\n"
  "-\tstruct drm_framebuffer *fb;\n"
@@ -249,7 +250,7 @@
  "-\tuint32_t size;\n"
  "-\tint ret = 0;\n"
  "-\n"
- "-\tif (sizes->surface_bpp = 24)\n"
+ "-\tif (sizes->surface_bpp == 24)\n"
  "-\t\tsizes->surface_bpp = 32;\n"
  "-\n"
  "-\tmode_cmd.width = sizes->surface_width;\n"
@@ -428,6 +429,11 @@
  " \n"
  " int udl_modeset_init(struct drm_device *dev)\n"
  "-- \n"
- 2.23.0
+ "2.23.0\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-d23b91948f994c6beda0b00d32caabda1b47e39f8515c04f8f2cd02ba1b19669
+80350462e5d91087c880fd044b45d7500f5ccc93e28d9d3f887fd51bbdad6dbc
