diff for duplicates of <4423A434.5070701@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 126221b..3da386c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> 4 files changed, 42 insertions(+) Index: linux-2.6.16_WORK/arch/ia64/Kconfig -=================================--- linux-2.6.16_WORK.orig/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.16_WORK.orig/arch/ia64/Kconfig +++ linux-2.6.16_WORK/arch/ia64/Kconfig @@ -410,6 +410,16 @@ bool @@ -32,7 +33,8 @@ Index: linux-2.6.16_WORK/arch/ia64/Kconfig source "drivers/pci/hotplug/Kconfig" Index: linux-2.6.16_WORK/arch/ia64/lib/Makefile -=================================--- linux-2.6.16_WORK.orig/arch/ia64/lib/Makefile +=================================================================== +--- linux-2.6.16_WORK.orig/arch/ia64/lib/Makefile +++ linux-2.6.16_WORK/arch/ia64/lib/Makefile @@ -15,6 +15,7 @@ lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o @@ -40,9 +42,11 @@ Index: linux-2.6.16_WORK/arch/ia64/lib/Makefile lib-$(CONFIG_MD_RAID5) += xor.o +lib-$(CONFIG_PCIERR_CHECK) += pcierr_check.o - AFLAGS___divdi3.o AFLAGS___udivdi3.o = -DUNSIGNED + AFLAGS___divdi3.o = + AFLAGS___udivdi3.o = -DUNSIGNED Index: linux-2.6.16_WORK/include/asm-ia64/pci.h -=================================--- linux-2.6.16_WORK.orig/include/asm-ia64/pci.h +=================================================================== +--- linux-2.6.16_WORK.orig/include/asm-ia64/pci.h +++ linux-2.6.16_WORK/include/asm-ia64/pci.h @@ -171,4 +171,12 @@ @@ -58,7 +62,8 @@ Index: linux-2.6.16_WORK/include/asm-ia64/pci.h + #endif /* _ASM_IA64_PCI_H */ Index: linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c @@ -0,0 +1,23 @@ +/* diff --git a/a/content_digest b/N1/content_digest index 227441a..f9a76d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\044210D1B.7010806@jp.fujitsu.com\0" "ref\020060322210157.GH12335@kroah.com\0" "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0" - "Subject\0[PATCH 2/6] PCIERR : interfaces for synchronous I/O error detection\0" - "Date\0Fri, 24 Mar 2006 07:48:04 +0000\0" + "Subject\0[PATCH 2/6] PCIERR : interfaces for synchronous I/O error detection on driver (config)\0" + "Date\0Fri, 24 Mar 2006 16:48:04 +0900\0" "To\0Greg KH <greg@kroah.com>\0" "Cc\0Linux Kernel list <linux-kernel@vger.kernel.org>" linux-ia64@vger.kernel.org @@ -23,7 +23,8 @@ " 4 files changed, 42 insertions(+)\n" "\n" "Index: linux-2.6.16_WORK/arch/ia64/Kconfig\n" - "=================================--- linux-2.6.16_WORK.orig/arch/ia64/Kconfig\n" + "===================================================================\n" + "--- linux-2.6.16_WORK.orig/arch/ia64/Kconfig\n" "+++ linux-2.6.16_WORK/arch/ia64/Kconfig\n" "@@ -410,6 +410,16 @@\n" " \tbool\n" @@ -43,7 +44,8 @@ "\n" " source \"drivers/pci/hotplug/Kconfig\"\n" "Index: linux-2.6.16_WORK/arch/ia64/lib/Makefile\n" - "=================================--- linux-2.6.16_WORK.orig/arch/ia64/lib/Makefile\n" + "===================================================================\n" + "--- linux-2.6.16_WORK.orig/arch/ia64/lib/Makefile\n" "+++ linux-2.6.16_WORK/arch/ia64/lib/Makefile\n" "@@ -15,6 +15,7 @@\n" " lib-$(CONFIG_MCKINLEY)\t+= copy_page_mck.o memcpy_mck.o\n" @@ -51,9 +53,11 @@ " lib-$(CONFIG_MD_RAID5)\t+= xor.o\n" "+lib-$(CONFIG_PCIERR_CHECK) += pcierr_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.16_WORK/include/asm-ia64/pci.h\n" - "=================================--- linux-2.6.16_WORK.orig/include/asm-ia64/pci.h\n" + "===================================================================\n" + "--- linux-2.6.16_WORK.orig/include/asm-ia64/pci.h\n" "+++ linux-2.6.16_WORK/include/asm-ia64/pci.h\n" "@@ -171,4 +171,12 @@\n" "\n" @@ -69,7 +73,8 @@ "+\n" " #endif /* _ASM_IA64_PCI_H */\n" "Index: linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux-2.6.16_WORK/arch/ia64/lib/pcierr_check.c\n" "@@ -0,0 +1,23 @@\n" "+/*\n" @@ -96,4 +101,4 @@ "+EXPORT_SYMBOL(pcierr_read);\n" +EXPORT_SYMBOL(pcierr_clear); -0312b09ef3d3cb1c0d2952a7b1264a7b4fedf70756ea5564cf1b57a32d768ee3 +636822b611d231c2de57671239b1a2bc54bd76e483e093cd758db92999e61767
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.