diff for duplicates of <42CB6566.8090804@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 1fb3bb5..9752024 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 4 files changed, 57 insertions(+) Index: linux-2.6.13-rc1/arch/ia64/lib/Makefile -=================================--- linux-2.6.13-rc1.orig/arch/ia64/lib/Makefile +=================================================================== +--- linux-2.6.13-rc1.orig/arch/ia64/lib/Makefile +++ linux-2.6.13-rc1/arch/ia64/lib/Makefile @@ -16,6 +16,7 @@ lib-$(CONFIG_MCKINLEY) += copy_page_mck. lib-$(CONFIG_PERFMON) += carta_random.o @@ -29,9 +30,11 @@ Index: linux-2.6.13-rc1/arch/ia64/lib/Makefile lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o +lib-$(CONFIG_IOMAP_CHECK) += iomap_check.o - AFLAGS___divdi3.o AFLAGS___udivdi3.o = -DUNSIGNED + AFLAGS___divdi3.o = + AFLAGS___udivdi3.o = -DUNSIGNED Index: linux-2.6.13-rc1/arch/ia64/Kconfig -=================================--- linux-2.6.13-rc1.orig/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.13-rc1.orig/arch/ia64/Kconfig +++ linux-2.6.13-rc1/arch/ia64/Kconfig @@ -413,6 +413,19 @@ config PCI_DOMAINS bool @@ -54,7 +57,8 @@ Index: linux-2.6.13-rc1/arch/ia64/Kconfig source "drivers/pci/hotplug/Kconfig" Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c @@ -0,0 +1,30 @@ +/* @@ -88,7 +92,8 @@ Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c +EXPORT_SYMBOL(iochk_read); +EXPORT_SYMBOL(iochk_clear); Index: linux-2.6.13-rc1/include/asm-ia64/io.h -=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h +=================================================================== +--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h +++ linux-2.6.13-rc1/include/asm-ia64/io.h @@ -70,6 +70,19 @@ extern unsigned int num_io_spaces; #include <asm/machvec.h> diff --git a/a/content_digest b/N1/content_digest index edd53bc..a8ee129 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\042CB63B2.6000505@jp.fujitsu.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" "Subject\0[PATCH 2.6.13-rc1 02/10] IOCHK interface for I/O error handling/detecting\0" - "Date\0Wed, 06 Jul 2005 04:58:12 +0000\0" + "Date\0Wed, 06 Jul 2005 14:00:22 +0900\0" "To\0Linux Kernel list <linux-kernel@vger.kernel.org>" linux-ia64@vger.kernel.org Luck @@ -36,7 +36,8 @@ " 4 files changed, 57 insertions(+)\n" "\n" "Index: linux-2.6.13-rc1/arch/ia64/lib/Makefile\n" - "=================================--- linux-2.6.13-rc1.orig/arch/ia64/lib/Makefile\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/arch/ia64/lib/Makefile\n" "+++ linux-2.6.13-rc1/arch/ia64/lib/Makefile\n" "@@ -16,6 +16,7 @@ lib-$(CONFIG_MCKINLEY)\t+= copy_page_mck.\n" " lib-$(CONFIG_PERFMON)\t+= carta_random.o\n" @@ -44,9 +45,11 @@ " lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o\n" "+lib-$(CONFIG_IOMAP_CHECK) += iomap_check.o\n" "\n" - " AFLAGS___divdi3.o\t AFLAGS___udivdi3.o\t= -DUNSIGNED\n" + " AFLAGS___divdi3.o\t=\n" + " AFLAGS___udivdi3.o\t= -DUNSIGNED\n" "Index: linux-2.6.13-rc1/arch/ia64/Kconfig\n" - "=================================--- linux-2.6.13-rc1.orig/arch/ia64/Kconfig\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/arch/ia64/Kconfig\n" "+++ linux-2.6.13-rc1/arch/ia64/Kconfig\n" "@@ -413,6 +413,19 @@ config PCI_DOMAINS\n" " \tbool\n" @@ -69,7 +72,8 @@ "\n" " source \"drivers/pci/hotplug/Kconfig\"\n" "Index: linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux-2.6.13-rc1/arch/ia64/lib/iomap_check.c\n" "@@ -0,0 +1,30 @@\n" "+/*\n" @@ -103,7 +107,8 @@ "+EXPORT_SYMBOL(iochk_read);\n" "+EXPORT_SYMBOL(iochk_clear);\n" "Index: linux-2.6.13-rc1/include/asm-ia64/io.h\n" - "=================================--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h\n" + "===================================================================\n" + "--- linux-2.6.13-rc1.orig/include/asm-ia64/io.h\n" "+++ linux-2.6.13-rc1/include/asm-ia64/io.h\n" "@@ -70,6 +70,19 @@ extern unsigned int num_io_spaces;\n" " #include <asm/machvec.h>\n" @@ -126,4 +131,4 @@ "\n" /* -c9710d0c137be7de550e617fe0541860efa1f3c3039e2c5a974f248e74694d14 +aa496631670b3a7535adf8f3f63e4b759be5bf03cc944a78b0a487d20de294a4
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.