diff for duplicates of <1178607344.2613.9.camel@linux-znh>

diff --git a/a/1.txt b/N1/1.txt
index 8a0b068..31a94d7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -76,8 +76,7 @@ On Tue, 2007-05-08 at 14:32, Simon Horman wrote:
 > >  kernel/kexec.c                   |   13 +++++++++-
 > >  5 files changed, 26 insertions(+), 47 deletions(-)
 > > Index: linux-2.6/arch/ia64/kernel/crash.c
-> > ===================================================================
-> > --- linux-2.6.orig/arch/ia64/kernel/crash.c   2007-04-25
+> > =================================> > --- linux-2.6.orig/arch/ia64/kernel/crash.c   2007-04-25
 > 17:31:54.000000000 +0900
 > > +++ linux-2.6/arch/ia64/kernel/crash.c        2007-04-25
 > 17:31:55.000000000 +0900
@@ -156,8 +155,7 @@ On Tue, 2007-05-08 at 14:32, Simon Horman wrote:
 > >       atomic_inc(&kdump_cpu_frozen);
 > >       kdump_status[cpuid] = 1;
 > > Index: linux-2.6/include/asm-ia64/kexec.h
-> > ===================================================================
-> > --- linux-2.6.orig/include/asm-ia64/kexec.h   2007-04-25
+> > =================================> > --- linux-2.6.orig/include/asm-ia64/kexec.h   2007-04-25
 > 17:31:54.000000000 +0900
 > > +++ linux-2.6/include/asm-ia64/kexec.h        2007-04-25
 > 17:31:55.000000000 +0900
@@ -184,8 +182,7 @@ On Tue, 2007-05-08 at 14:32, Simon Horman wrote:
 > >  extern unsigned long kdump_find_rsvd_region(unsigned long size,
 > >               struct rsvd_region *rsvd_regions, int n);
 > > Index: linux-2.6/include/linux/kexec.h
-> > ===================================================================
-> > --- linux-2.6.orig/include/linux/kexec.h      2007-04-25
+> > =================================> > --- linux-2.6.orig/include/linux/kexec.h      2007-04-25
 > 17:31:54.000000000 +0900
 > > +++ linux-2.6/include/linux/kexec.h   2007-04-25 17:31:55.000000000
 > +0900
@@ -202,8 +199,7 @@ On Tue, 2007-05-08 at 14:32, Simon Horman wrote:
 > >  #define KEXEC_ARCH_MASK 0xffff0000
 > >  
 > > Index: linux-2.6/kernel/kexec.c
-> > ===================================================================
-> > --- linux-2.6.orig/kernel/kexec.c     2007-04-25 17:31:54.000000000
+> > =================================> > --- linux-2.6.orig/kernel/kexec.c     2007-04-25 17:31:54.000000000
 > +0900
 > > +++ linux-2.6/kernel/kexec.c  2007-04-25 17:57:12.000000000 +0900
 > > @@ -1097,9 +1097,18 @@ static void final_note(u32 *buf)
@@ -255,15 +251,14 @@ On Tue, 2007-05-08 at 14:32, Simon Horman wrote:
 > >  }
 > >  
 > > Index: linux-2.6/arch/ia64/kernel/machine_kexec.c
-> > ===================================================================
-> > --- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c   2007-04-25
+> > =================================> > --- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c   2007-04-25
 > 17:31:54.000000000 +0900
 > > +++ linux-2.6/arch/ia64/kernel/machine_kexec.c        2007-04-25
 > 17:31:55.000000000 +0900
 > > @@ -84,7 +84,7 @@ static void ia64_machine_kexec(struct un
 > >  
 > >       BUG_ON(!image);
-> >       if (image->type == KEXEC_TYPE_CRASH) {
+> >       if (image->type = KEXEC_TYPE_CRASH) {
 > > -             crash_save_this_cpu();
 > > +             crash_save_cpu(NULL, smp_processor_id());
 > >               current->thread.ksp = (__u64)info->sw - 16;
@@ -285,9 +280,4 @@ Zou Nan hai
 > linux-ia64" in
 > > the body of a message to majordomo@vger.kernel.org
 > > More majordomo info at  http://vger.kernel.org/majordomo-info.html
-> 
-
-_______________________________________________
-kexec mailing list
-kexec@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/kexec
+>
diff --git a/a/content_digest b/N1/content_digest
index 1273f84..ac6b78d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
  "ref\020070508063239.GA31881@verge.net.au\0"
  "From\0Zou Nan hai <nanhai.zou@intel.com>\0"
  "Subject\0Re: kexec/kdump: Use generic elf code on ia64\0"
- "Date\008 May 2007 14:55:44 +0800\0"
+ "Date\0Tue, 08 May 2007 06:55:44 +0000\0"
  "To\0Simon Horman <horms@verge.net.au>\0"
  "Cc\0kexec@lists.infradead.org"
   Linux-IA64 <linux-ia64@vger.kernel.org>
@@ -90,8 +90,7 @@
  "> >  kernel/kexec.c                   |   13 +++++++++-\n"
  "> >  5 files changed, 26 insertions(+), 47 deletions(-)\n"
  "> > Index: linux-2.6/arch/ia64/kernel/crash.c\n"
- "> > ===================================================================\n"
- "> > --- linux-2.6.orig/arch/ia64/kernel/crash.c   2007-04-25\n"
+ "> > =================================> > --- linux-2.6.orig/arch/ia64/kernel/crash.c   2007-04-25\n"
  "> 17:31:54.000000000 +0900\n"
  "> > +++ linux-2.6/arch/ia64/kernel/crash.c        2007-04-25\n"
  "> 17:31:55.000000000 +0900\n"
@@ -170,8 +169,7 @@
  "> >       atomic_inc(&kdump_cpu_frozen);\n"
  "> >       kdump_status[cpuid] = 1;\n"
  "> > Index: linux-2.6/include/asm-ia64/kexec.h\n"
- "> > ===================================================================\n"
- "> > --- linux-2.6.orig/include/asm-ia64/kexec.h   2007-04-25\n"
+ "> > =================================> > --- linux-2.6.orig/include/asm-ia64/kexec.h   2007-04-25\n"
  "> 17:31:54.000000000 +0900\n"
  "> > +++ linux-2.6/include/asm-ia64/kexec.h        2007-04-25\n"
  "> 17:31:55.000000000 +0900\n"
@@ -198,8 +196,7 @@
  "> >  extern unsigned long kdump_find_rsvd_region(unsigned long size,\n"
  "> >               struct rsvd_region *rsvd_regions, int n);\n"
  "> > Index: linux-2.6/include/linux/kexec.h\n"
- "> > ===================================================================\n"
- "> > --- linux-2.6.orig/include/linux/kexec.h      2007-04-25\n"
+ "> > =================================> > --- linux-2.6.orig/include/linux/kexec.h      2007-04-25\n"
  "> 17:31:54.000000000 +0900\n"
  "> > +++ linux-2.6/include/linux/kexec.h   2007-04-25 17:31:55.000000000\n"
  "> +0900\n"
@@ -216,8 +213,7 @@
  "> >  #define KEXEC_ARCH_MASK 0xffff0000\n"
  "> >  \n"
  "> > Index: linux-2.6/kernel/kexec.c\n"
- "> > ===================================================================\n"
- "> > --- linux-2.6.orig/kernel/kexec.c     2007-04-25 17:31:54.000000000\n"
+ "> > =================================> > --- linux-2.6.orig/kernel/kexec.c     2007-04-25 17:31:54.000000000\n"
  "> +0900\n"
  "> > +++ linux-2.6/kernel/kexec.c  2007-04-25 17:57:12.000000000 +0900\n"
  "> > @@ -1097,9 +1097,18 @@ static void final_note(u32 *buf)\n"
@@ -269,15 +265,14 @@
  "> >  }\n"
  "> >  \n"
  "> > Index: linux-2.6/arch/ia64/kernel/machine_kexec.c\n"
- "> > ===================================================================\n"
- "> > --- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c   2007-04-25\n"
+ "> > =================================> > --- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c   2007-04-25\n"
  "> 17:31:54.000000000 +0900\n"
  "> > +++ linux-2.6/arch/ia64/kernel/machine_kexec.c        2007-04-25\n"
  "> 17:31:55.000000000 +0900\n"
  "> > @@ -84,7 +84,7 @@ static void ia64_machine_kexec(struct un\n"
  "> >  \n"
  "> >       BUG_ON(!image);\n"
- "> >       if (image->type == KEXEC_TYPE_CRASH) {\n"
+ "> >       if (image->type = KEXEC_TYPE_CRASH) {\n"
  "> > -             crash_save_this_cpu();\n"
  "> > +             crash_save_cpu(NULL, smp_processor_id());\n"
  "> >               current->thread.ksp = (__u64)info->sw - 16;\n"
@@ -299,11 +294,6 @@
  "> linux-ia64\" in\n"
  "> > the body of a message to majordomo@vger.kernel.org\n"
  "> > More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"
- "> \n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ >
 
-403b016ecf335e1e01b771cecb3c5d75afc74c6b80444442d449662b258377dd
+012026047a766e0993b45201fbfeaa428200831bb054f2c011dbb984f5c325d2
