diff for duplicates of <20180824115851.GC11867@sci.fi>

diff --git a/a/1.txt b/N1/1.txt
index 1d1227a..8e2e927 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,7 +34,8 @@ On Thu, Aug 23, 2018 at 05:17:20PM -0400, Mikulas Patocka wrote:
 > > >  3 files changed, 11 insertions(+), 9 deletions(-)
 > > > 
 > > > Index: linux-stable/drivers/video/fbdev/aty/atyfb.h
-> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb.h	2018-08-13 21:12:11.000000000 +0200
+> > > ===================================================================
+> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb.h	2018-08-13 21:12:11.000000000 +0200
 > > > +++ linux-stable/drivers/video/fbdev/aty/atyfb.h	2018-08-13 21:17:14.000000000 +0200
 > > > @@ -333,6 +333,8 @@ extern const struct aty_pll_ops aty_pll_
 > > >  extern void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll);
@@ -54,7 +55,8 @@ On Thu, Aug 23, 2018 at 05:17:20PM -0400, Mikulas Patocka wrote:
 > > >  void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 > > >  void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
 > > > Index: linux-stable/drivers/video/fbdev/aty/atyfb_base.c
-> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb_base.c	2018-08-13 21:12:11.000000000 +0200
+> > > ===================================================================
+> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb_base.c	2018-08-13 21:12:11.000000000 +0200
 > > > +++ linux-stable/drivers/video/fbdev/aty/atyfb_base.c	2018-08-13 21:22:23.000000000 +0200
 > > > @@ -3087,17 +3087,18 @@ static int atyfb_setup_sparc(struct pci_
 > > >  		/*
@@ -79,7 +81,8 @@ On Thu, Aug 23, 2018 at 05:17:20PM -0400, Mikulas Patocka wrote:
 > > >  		/*
 > > >  		 * PLL Divider Q:
 > > > Index: linux-stable/drivers/video/fbdev/aty/mach64_ct.c
-> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/mach64_ct.c	2018-08-13 21:12:11.000000000 +0200
+> > > ===================================================================
+> > > --- linux-stable.orig/drivers/video/fbdev/aty/mach64_ct.c	2018-08-13 21:12:11.000000000 +0200
 > > > +++ linux-stable/drivers/video/fbdev/aty/mach64_ct.c	2018-08-13 21:35:32.000000000 +0200
 > > > @@ -115,7 +115,7 @@ static void aty_st_pll_ct(int offset, u8
 > > >   */
@@ -123,3 +126,7 @@ value to use here.
 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 84ab144..ac18664 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,7 +3,7 @@
  "ref\0alpine.LRH.2.02.1808231706420.13157@file01.intranet.prod.int.rdu2.redhat.com\0"
  "From\0Ville Syrj\303\244l\303\244 <syrjala@sci.fi>\0"
  "Subject\0Re: [PATCH] mach64: detect the dot clock divider correctly on sparc\0"
- "Date\0Fri, 24 Aug 2018 11:58:52 +0000\0"
+ "Date\0Fri, 24 Aug 2018 14:58:52 +0300\0"
  "To\0Mikulas Patocka <mpatocka@redhat.com>\0"
  "Cc\0sparclinux@vger.kernel.org"
   linux-fbdev@vger.kernel.org
@@ -48,7 +48,8 @@
  "> > >  3 files changed, 11 insertions(+), 9 deletions(-)\n"
  "> > > \n"
  "> > > Index: linux-stable/drivers/video/fbdev/aty/atyfb.h\n"
- "> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb.h\t2018-08-13 21:12:11.000000000 +0200\n"
+ "> > > ===================================================================\n"
+ "> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb.h\t2018-08-13 21:12:11.000000000 +0200\n"
  "> > > +++ linux-stable/drivers/video/fbdev/aty/atyfb.h\t2018-08-13 21:17:14.000000000 +0200\n"
  "> > > @@ -333,6 +333,8 @@ extern const struct aty_pll_ops aty_pll_\n"
  "> > >  extern void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll);\n"
@@ -68,7 +69,8 @@
  "> > >  void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);\n"
  "> > >  void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);\n"
  "> > > Index: linux-stable/drivers/video/fbdev/aty/atyfb_base.c\n"
- "> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb_base.c\t2018-08-13 21:12:11.000000000 +0200\n"
+ "> > > ===================================================================\n"
+ "> > > --- linux-stable.orig/drivers/video/fbdev/aty/atyfb_base.c\t2018-08-13 21:12:11.000000000 +0200\n"
  "> > > +++ linux-stable/drivers/video/fbdev/aty/atyfb_base.c\t2018-08-13 21:22:23.000000000 +0200\n"
  "> > > @@ -3087,17 +3087,18 @@ static int atyfb_setup_sparc(struct pci_\n"
  "> > >  \t\t/*\n"
@@ -93,7 +95,8 @@
  "> > >  \t\t/*\n"
  "> > >  \t\t * PLL Divider Q:\n"
  "> > > Index: linux-stable/drivers/video/fbdev/aty/mach64_ct.c\n"
- "> > > =================================> > > --- linux-stable.orig/drivers/video/fbdev/aty/mach64_ct.c\t2018-08-13 21:12:11.000000000 +0200\n"
+ "> > > ===================================================================\n"
+ "> > > --- linux-stable.orig/drivers/video/fbdev/aty/mach64_ct.c\t2018-08-13 21:12:11.000000000 +0200\n"
  "> > > +++ linux-stable/drivers/video/fbdev/aty/mach64_ct.c\t2018-08-13 21:35:32.000000000 +0200\n"
  "> > > @@ -115,7 +115,7 @@ static void aty_st_pll_ct(int offset, u8\n"
  "> > >   */\n"
@@ -136,6 +139,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
 
-711f049fdb2bc06d059ed090d3affb753f10414ecc4c6faae880b739ff3047f6
+5aa235b3db8903ccbbda9c47cdd05361a61ba793e093481971c43a2c39329454
