diff for duplicates of <20090209162520.GA4882@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 14f8ec9..7ef748b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,8 @@ Signed-off-by: Jack Steiner <steiner@sgi.com> 4 files changed, 24 insertions(+), 31 deletions(-) Index: linux/arch/ia64/include/asm/uv/uv.h -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux/arch/ia64/include/asm/uv/uv.h 2009-02-09 09:18:45.657924900 -0600 @@ -0,0 +1,13 @@ +#ifndef _ASM_IA64_UV_UV_H @@ -30,7 +31,8 @@ Index: linux/arch/ia64/include/asm/uv/uv.h + +#endif /* _ASM_IA64_UV_UV_H */ Index: linux/drivers/misc/sgi-gru/gru.h -=================================--- linux.orig/drivers/misc/sgi-gru/gru.h 2009-02-09 09:18:43.485658003 -0600 +=================================================================== +--- linux.orig/drivers/misc/sgi-gru/gru.h 2009-02-09 09:18:43.485658003 -0600 +++ linux/drivers/misc/sgi-gru/gru.h 2009-02-09 09:18:45.677927344 -0600 @@ -19,8 +19,6 @@ #ifndef __GRU_H__ @@ -42,7 +44,8 @@ Index: linux/drivers/misc/sgi-gru/gru.h * GRU architectural definitions */ Index: linux/drivers/misc/sgi-gru/grufile.c -=================================--- linux.orig/drivers/misc/sgi-gru/grufile.c 2009-02-09 09:18:43.485658003 -0600 +=================================================================== +--- linux.orig/drivers/misc/sgi-gru/grufile.c 2009-02-09 09:18:43.485658003 -0600 +++ linux/drivers/misc/sgi-gru/grufile.c 2009-02-09 09:18:45.697930179 -0600 @@ -36,23 +36,11 @@ #include <linux/interrupt.h> @@ -88,7 +91,8 @@ Index: linux/drivers/misc/sgi-gru/grufile.c for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++) Index: linux/drivers/misc/sgi-xp/xp.h -=================================--- linux.orig/drivers/misc/sgi-xp/xp.h 2009-02-09 09:18:43.489658800 -0600 +=================================================================== +--- linux.orig/drivers/misc/sgi-xp/xp.h 2009-02-09 09:18:43.489658800 -0600 +++ linux/drivers/misc/sgi-xp/xp.h 2009-02-09 09:19:18.065905314 -0600 @@ -15,21 +15,19 @@ diff --git a/a/content_digest b/N1/content_digest index 2156815..399150f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[PATCH] SGI IA64 UV: fix ia64 build error in the linux-next tree\0" - "Date\0Mon, 09 Feb 2009 16:25:20 +0000\0" + "Date\0Mon, 9 Feb 2009 10:25:20 -0600\0" "To\0Tony Luck <tony.luck@intel.com>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Andrew Morton <akpm@linux-foundation.org> @@ -24,7 +24,8 @@ " 4 files changed, 24 insertions(+), 31 deletions(-)\n" "\n" "Index: linux/arch/ia64/include/asm/uv/uv.h\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux/arch/ia64/include/asm/uv/uv.h\t2009-02-09 09:18:45.657924900 -0600\n" "@@ -0,0 +1,13 @@\n" "+#ifndef _ASM_IA64_UV_UV_H\n" @@ -41,7 +42,8 @@ "+\n" "+#endif\t/* _ASM_IA64_UV_UV_H */\n" "Index: linux/drivers/misc/sgi-gru/gru.h\n" - "=================================--- linux.orig/drivers/misc/sgi-gru/gru.h\t2009-02-09 09:18:43.485658003 -0600\n" + "===================================================================\n" + "--- linux.orig/drivers/misc/sgi-gru/gru.h\t2009-02-09 09:18:43.485658003 -0600\n" "+++ linux/drivers/misc/sgi-gru/gru.h\t2009-02-09 09:18:45.677927344 -0600\n" "@@ -19,8 +19,6 @@\n" " #ifndef __GRU_H__\n" @@ -53,7 +55,8 @@ " * GRU architectural definitions\n" " */\n" "Index: linux/drivers/misc/sgi-gru/grufile.c\n" - "=================================--- linux.orig/drivers/misc/sgi-gru/grufile.c\t2009-02-09 09:18:43.485658003 -0600\n" + "===================================================================\n" + "--- linux.orig/drivers/misc/sgi-gru/grufile.c\t2009-02-09 09:18:43.485658003 -0600\n" "+++ linux/drivers/misc/sgi-gru/grufile.c\t2009-02-09 09:18:45.697930179 -0600\n" "@@ -36,23 +36,11 @@\n" " #include <linux/interrupt.h>\n" @@ -99,7 +102,8 @@ " \n" " \tfor (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)\n" "Index: linux/drivers/misc/sgi-xp/xp.h\n" - "=================================--- linux.orig/drivers/misc/sgi-xp/xp.h\t2009-02-09 09:18:43.489658800 -0600\n" + "===================================================================\n" + "--- linux.orig/drivers/misc/sgi-xp/xp.h\t2009-02-09 09:18:43.489658800 -0600\n" "+++ linux/drivers/misc/sgi-xp/xp.h\t2009-02-09 09:19:18.065905314 -0600\n" "@@ -15,21 +15,19 @@\n" " \n" @@ -143,4 +147,4 @@ " #define DBUG_ON(condition)\tBUG_ON(condition)\n" #else -5c0241f5510030cfa671382eed362ddf0a14ea510b63a713d4844a29db8e0f60 +578e345ccc987db198e3bc83943e1ba49fe9a70c0beea3e65f413a3e1d1335a5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.