diff for duplicates of <42A83B0D.7040701@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 460368c..04e033c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 4 files changed, 55 insertions(+) Index: linux-2.6.11.11/arch/ia64/lib/Makefile -=================================--- linux-2.6.11.11.orig/arch/ia64/lib/Makefile +=================================================================== +--- linux-2.6.11.11.orig/arch/ia64/lib/Makefile +++ linux-2.6.11.11/arch/ia64/lib/Makefile @@ -16,6 +16,7 @@ lib-$(CONFIG_MCKINLEY) += copy_page_mck. lib-$(CONFIG_PERFMON) += carta_random.o @@ -26,9 +27,11 @@ Index: linux-2.6.11.11/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.11.11/arch/ia64/Kconfig -=================================--- linux-2.6.11.11.orig/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.11.11.orig/arch/ia64/Kconfig +++ linux-2.6.11.11/arch/ia64/Kconfig @@ -381,6 +381,19 @@ config PCI_DOMAINS bool @@ -51,7 +54,8 @@ Index: linux-2.6.11.11/arch/ia64/Kconfig source "drivers/pci/hotplug/Kconfig" Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux-2.6.11.11/arch/ia64/lib/iomap_check.c @@ -0,0 +1,30 @@ +/* @@ -85,7 +89,8 @@ Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c +EXPORT_SYMBOL(iochk_read); +EXPORT_SYMBOL(iochk_clear); Index: linux-2.6.11.11/include/asm-ia64/io.h -=================================--- linux-2.6.11.11.orig/include/asm-ia64/io.h +=================================================================== +--- linux-2.6.11.11.orig/include/asm-ia64/io.h +++ linux-2.6.11.11/include/asm-ia64/io.h @@ -70,6 +70,17 @@ extern unsigned int num_io_spaces; #include <asm/machvec.h> diff --git a/a/content_digest b/N1/content_digest index c3b584b..9a2dcf8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\042A8386F.2060100@jp.fujitsu.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" "Subject\0[PATCH 02/10] IOCHK interface for I/O error handling/detecting\0" - "Date\0Thu, 09 Jun 2005 12:50:21 +0000\0" + "Date\0Thu, 09 Jun 2005 21:50:21 +0900\0" "To\0Linux Kernel list <linux-kernel@vger.kernel.org>" " linux-ia64@vger.kernel.org\0" "Cc\0Linas Vepstas <linas@austin.ibm.com>" @@ -31,7 +31,8 @@ " 4 files changed, 55 insertions(+)\n" "\n" "Index: linux-2.6.11.11/arch/ia64/lib/Makefile\n" - "=================================--- linux-2.6.11.11.orig/arch/ia64/lib/Makefile\n" + "===================================================================\n" + "--- linux-2.6.11.11.orig/arch/ia64/lib/Makefile\n" "+++ linux-2.6.11.11/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" @@ -39,9 +40,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.11.11/arch/ia64/Kconfig\n" - "=================================--- linux-2.6.11.11.orig/arch/ia64/Kconfig\n" + "===================================================================\n" + "--- linux-2.6.11.11.orig/arch/ia64/Kconfig\n" "+++ linux-2.6.11.11/arch/ia64/Kconfig\n" "@@ -381,6 +381,19 @@ config PCI_DOMAINS\n" " \tbool\n" @@ -64,7 +67,8 @@ "\n" " source \"drivers/pci/hotplug/Kconfig\"\n" "Index: linux-2.6.11.11/arch/ia64/lib/iomap_check.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux-2.6.11.11/arch/ia64/lib/iomap_check.c\n" "@@ -0,0 +1,30 @@\n" "+/*\n" @@ -98,7 +102,8 @@ "+EXPORT_SYMBOL(iochk_read);\n" "+EXPORT_SYMBOL(iochk_clear);\n" "Index: linux-2.6.11.11/include/asm-ia64/io.h\n" - "=================================--- linux-2.6.11.11.orig/include/asm-ia64/io.h\n" + "===================================================================\n" + "--- linux-2.6.11.11.orig/include/asm-ia64/io.h\n" "+++ linux-2.6.11.11/include/asm-ia64/io.h\n" "@@ -70,6 +70,17 @@ extern unsigned int num_io_spaces;\n" " #include <asm/machvec.h>\n" @@ -119,4 +124,4 @@ "\n" /* -4a8ed3e140afb567dfb52ac5837d436dce24796bdaa9411aaf63081460229df1 +fe3324dadd2cd5577217aaaa9a863773b54c51fc0d2db66f43cb109091cd1832
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.