diff for duplicates of <20180827125452.GD11867@sci.fi>

diff --git a/a/1.txt b/N1/1.txt
index 6ec1105..ffbdd77 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -19,14 +19,15 @@ Reviewed-by: Ville Syrjälä <syrjala@sci.fi>
 >  1 file changed, 3 insertions(+), 3 deletions(-)
 > 
 > Index: linux-stable/drivers/video/fbdev/aty/mach64_accel.c
-> =================================> --- linux-stable.orig/drivers/video/fbdev/aty/mach64_accel.c	2018-08-24 17:31:21.000000000 +0200
+> ===================================================================
+> --- linux-stable.orig/drivers/video/fbdev/aty/mach64_accel.c	2018-08-24 17:31:21.000000000 +0200
 > +++ linux-stable/drivers/video/fbdev/aty/mach64_accel.c	2018-08-24 19:12:40.000000000 +0200
 > @@ -345,7 +345,7 @@ void atyfb_imageblit(struct fb_info *inf
 >  		 * since Rage 3D IIc we have DP_HOST_TRIPLE_EN bit
 >  		 * this hwaccelerated triple has an issue with not aligned data
 >  		 */
-> -		if (M64_HAS(HW_TRIPLE) && image->width % 8 = 0)
-> +		if (image->depth = 1 && M64_HAS(HW_TRIPLE) && image->width % 8 = 0)
+> -		if (M64_HAS(HW_TRIPLE) && image->width % 8 == 0)
+> +		if (image->depth == 1 && M64_HAS(HW_TRIPLE) && image->width % 8 == 0)
 >  			pix_width |= DP_HOST_TRIPLE_EN;
 >  	}
 >  
@@ -34,8 +35,8 @@ Reviewed-by: Ville Syrjälä <syrjala@sci.fi>
 >  	src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
 >  
 >  	/* manual triple each pixel */
-> -	if (info->var.bits_per_pixel = 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {
-> +	if (image->depth = 1 && info->var.bits_per_pixel = 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {
+> -	if (info->var.bits_per_pixel == 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {
+> +	if (image->depth == 1 && info->var.bits_per_pixel == 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {
 >  		int inbit, outbit, mult24, byte_id_in_dword, width;
 >  		u8 *pbitmapin = (u8*)image->data, *pbitmapout;
 >  		u32 hostdword;
@@ -53,3 +54,7 @@ Reviewed-by: Ville Syrjälä <syrjala@sci.fi>
 Ville Syrjälä
 syrjala@sci.fi
 http://www.sci.fi/~syrjala/
+_______________________________________________
+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 c9ea5f6..c839055 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\0alpine.LRH.2.02.1808251549550.8284@file01.intranet.prod.int.rdu2.redhat.com\0"
  "From\0Ville Syrj\303\244l\303\244 <syrjala@sci.fi>\0"
  "Subject\0Re: [PATCH 1/3] mach64: fix display corruption on big endian machines\0"
- "Date\0Mon, 27 Aug 2018 12:54:52 +0000\0"
+ "Date\0Mon, 27 Aug 2018 15:54:52 +0300\0"
  "To\0Mikulas Patocka <mpatocka@redhat.com>\0"
  "Cc\0linux-fbdev@vger.kernel.org"
   dri-devel@lists.freedesktop.org
@@ -29,14 +29,15 @@
  ">  1 file changed, 3 insertions(+), 3 deletions(-)\n"
  "> \n"
  "> Index: linux-stable/drivers/video/fbdev/aty/mach64_accel.c\n"
- "> =================================> --- linux-stable.orig/drivers/video/fbdev/aty/mach64_accel.c\t2018-08-24 17:31:21.000000000 +0200\n"
+ "> ===================================================================\n"
+ "> --- linux-stable.orig/drivers/video/fbdev/aty/mach64_accel.c\t2018-08-24 17:31:21.000000000 +0200\n"
  "> +++ linux-stable/drivers/video/fbdev/aty/mach64_accel.c\t2018-08-24 19:12:40.000000000 +0200\n"
  "> @@ -345,7 +345,7 @@ void atyfb_imageblit(struct fb_info *inf\n"
  ">  \t\t * since Rage 3D IIc we have DP_HOST_TRIPLE_EN bit\n"
  ">  \t\t * this hwaccelerated triple has an issue with not aligned data\n"
  ">  \t\t */\n"
- "> -\t\tif (M64_HAS(HW_TRIPLE) && image->width % 8 = 0)\n"
- "> +\t\tif (image->depth = 1 && M64_HAS(HW_TRIPLE) && image->width % 8 = 0)\n"
+ "> -\t\tif (M64_HAS(HW_TRIPLE) && image->width % 8 == 0)\n"
+ "> +\t\tif (image->depth == 1 && M64_HAS(HW_TRIPLE) && image->width % 8 == 0)\n"
  ">  \t\t\tpix_width |= DP_HOST_TRIPLE_EN;\n"
  ">  \t}\n"
  ">  \n"
@@ -44,8 +45,8 @@
  ">  \tsrc_bytes = (((image->width * image->depth) + 7) / 8) * image->height;\n"
  ">  \n"
  ">  \t/* manual triple each pixel */\n"
- "> -\tif (info->var.bits_per_pixel = 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {\n"
- "> +\tif (image->depth = 1 && info->var.bits_per_pixel = 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {\n"
+ "> -\tif (info->var.bits_per_pixel == 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {\n"
+ "> +\tif (image->depth == 1 && info->var.bits_per_pixel == 24 && !(pix_width & DP_HOST_TRIPLE_EN)) {\n"
  ">  \t\tint inbit, outbit, mult24, byte_id_in_dword, width;\n"
  ">  \t\tu8 *pbitmapin = (u8*)image->data, *pbitmapout;\n"
  ">  \t\tu32 hostdword;\n"
@@ -62,6 +63,10 @@
  "-- \n"
  "Ville Syrj\303\244l\303\244\n"
  "syrjala@sci.fi\n"
- http://www.sci.fi/~syrjala/
+ "http://www.sci.fi/~syrjala/\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-f46baa16573273d43ed63e7a99ea94768147da4afafece881fe8d93fed653d17
+a0ca0a46d04273f591eb0f6db02c5d75a8cbbd5c6a8dea4262c758372132d1d0
