diff for duplicates of <20160103050512.941979535@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index a5f99f2..9a44dfa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,243 +1,3 @@ -Remove unused includes (stat.h, signal.h, proc_fs.h) and move includes -needed by the core drivers into the common header (delay.h etc). - -Signed-off-by: Finn Thain <fthain@telegraphics.com.au> -Reviewed-by: Hannes Reinecke <hare@suse.com> -Tested-by: Ondrej Zary <linux@rainbow-software.org> -Tested-by: Michael Schmitz <schmitzmic@gmail.com> - ---- - drivers/scsi/NCR5380.c | 2 -- - drivers/scsi/NCR5380.h | 4 ++++ - drivers/scsi/arm/cumana_1.c | 4 ---- - drivers/scsi/arm/oak.c | 2 -- - drivers/scsi/atari_NCR5380.c | 5 ----- - drivers/scsi/atari_scsi.c | 1 - - drivers/scsi/dmx3191d.c | 5 ----- - drivers/scsi/dtc.c | 4 +--- - drivers/scsi/g_NCR5380.c | 6 ++---- - drivers/scsi/mac_scsi.c | 1 - - drivers/scsi/pas16.c | 4 ---- - drivers/scsi/t128.c | 3 --- - 12 files changed, 7 insertions(+), 34 deletions(-) - -Index: linux/drivers/scsi/NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.c 2016-01-03 16:03:59.000000000 +1100 -+++ linux/drivers/scsi/NCR5380.c 2016-01-03 16:04:00.000000000 +1100 -@@ -79,8 +79,6 @@ - * 4. Test SCSI-II tagged queueing (I have no devices which support - * tagged queueing) - */ --#include <scsi/scsi_dbg.h> --#include <scsi/scsi_transport_spi.h> - - #if (NDEBUG & NDEBUG_LISTS) - #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } -Index: linux/drivers/scsi/NCR5380.h -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.h 2016-01-03 16:03:54.000000000 +1100 -+++ linux/drivers/scsi/NCR5380.h 2016-01-03 16:04:00.000000000 +1100 -@@ -22,8 +22,12 @@ - #ifndef NCR5380_H - #define NCR5380_H - -+#include <linux/delay.h> - #include <linux/interrupt.h> -+#include <linux/workqueue.h> -+#include <scsi/scsi_dbg.h> - #include <scsi/scsi_eh.h> -+#include <scsi/scsi_transport_spi.h> - - #define NDEBUG_ARBITRATION 0x1 - #define NDEBUG_AUTOSENSE 0x2 -Index: linux/drivers/scsi/arm/cumana_1.c -=================================================================== ---- linux.orig/drivers/scsi/arm/cumana_1.c 2016-01-03 16:03:31.000000000 +1100 -+++ linux/drivers/scsi/arm/cumana_1.c 2016-01-03 16:04:00.000000000 +1100 -@@ -4,9 +4,7 @@ - * Copyright 1995-2002, Russell King - */ - #include <linux/module.h> --#include <linux/signal.h> - #include <linux/ioport.h> --#include <linux/delay.h> - #include <linux/blkdev.h> - #include <linux/init.h> - -@@ -15,8 +13,6 @@ - - #include <scsi/scsi_host.h> - --#include <scsi/scsicam.h> -- - #define PSEUDO_DMA - - #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) -Index: linux/drivers/scsi/arm/oak.c -=================================================================== ---- linux.orig/drivers/scsi/arm/oak.c 2016-01-03 16:03:31.000000000 +1100 -+++ linux/drivers/scsi/arm/oak.c 2016-01-03 16:04:00.000000000 +1100 -@@ -5,9 +5,7 @@ - */ - - #include <linux/module.h> --#include <linux/signal.h> - #include <linux/ioport.h> --#include <linux/delay.h> - #include <linux/blkdev.h> - #include <linux/init.h> - -Index: linux/drivers/scsi/atari_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/atari_NCR5380.c 2016-01-03 16:03:59.000000000 +1100 -+++ linux/drivers/scsi/atari_NCR5380.c 2016-01-03 16:04:00.000000000 +1100 -@@ -68,9 +68,6 @@ - - /* Adapted for the sun3 by Sam Creasey. */ - --#include <scsi/scsi_dbg.h> --#include <scsi/scsi_transport_spi.h> -- - #if (NDEBUG & NDEBUG_LISTS) - #define LIST(x, y) \ - do { \ -@@ -517,8 +514,6 @@ static inline int NCR5380_poll_politely( - reg, bit, val, wait); - } - --#include <linux/delay.h> -- - #if NDEBUG - static struct { - unsigned char mask; -Index: linux/drivers/scsi/atari_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/atari_scsi.c 2016-01-03 16:03:23.000000000 +1100 -+++ linux/drivers/scsi/atari_scsi.c 2016-01-03 16:04:00.000000000 +1100 -@@ -66,7 +66,6 @@ - - #include <linux/module.h> - #include <linux/types.h> --#include <linux/delay.h> - #include <linux/blkdev.h> - #include <linux/interrupt.h> - #include <linux/init.h> -Index: linux/drivers/scsi/dmx3191d.c -=================================================================== ---- linux.orig/drivers/scsi/dmx3191d.c 2016-01-03 16:03:23.000000000 +1100 -+++ linux/drivers/scsi/dmx3191d.c 2016-01-03 16:04:00.000000000 +1100 -@@ -41,11 +41,6 @@ - - #define NCR5380_implementation_fields /* none */ - --/* -- * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h) -- */ --#include <linux/delay.h> -- - #include "NCR5380.h" - #include "NCR5380.c" - -Index: linux/drivers/scsi/dtc.c -=================================================================== ---- linux.orig/drivers/scsi/dtc.c 2016-01-03 16:03:54.000000000 +1100 -+++ linux/drivers/scsi/dtc.c 2016-01-03 16:04:00.000000000 +1100 -@@ -46,15 +46,13 @@ - - - #include <linux/module.h> --#include <linux/signal.h> - #include <linux/blkdev.h> --#include <linux/delay.h> --#include <linux/stat.h> - #include <linux/string.h> - #include <linux/init.h> - #include <linux/interrupt.h> - #include <linux/io.h> - #include <scsi/scsi_host.h> -+ - #include "dtc.h" - #define AUTOPROBE_IRQ - #include "NCR5380.h" -Index: linux/drivers/scsi/g_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/g_NCR5380.c 2016-01-03 16:03:54.000000000 +1100 -+++ linux/drivers/scsi/g_NCR5380.c 2016-01-03 16:04:00.000000000 +1100 -@@ -63,16 +63,14 @@ - #endif - - #include <asm/io.h> --#include <linux/signal.h> - #include <linux/blkdev.h> -+#include <linux/module.h> - #include <scsi/scsi_host.h> - #include "g_NCR5380.h" - #include "NCR5380.h" --#include <linux/stat.h> - #include <linux/init.h> - #include <linux/ioport.h> - #include <linux/isapnp.h> --#include <linux/delay.h> - #include <linux/interrupt.h> - - static int ncr_irq; -@@ -732,7 +730,7 @@ static struct scsi_host_template driver_ - .cmd_per_lun = CMD_PER_LUN, - .use_clustering = DISABLE_CLUSTERING, - }; --#include <linux/module.h> -+ - #include "scsi_module.c" - - module_param(ncr_irq, int, 0); -Index: linux/drivers/scsi/mac_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/mac_scsi.c 2016-01-03 16:03:31.000000000 +1100 -+++ linux/drivers/scsi/mac_scsi.c 2016-01-03 16:04:00.000000000 +1100 -@@ -12,7 +12,6 @@ - */ - - #include <linux/types.h> --#include <linux/delay.h> - #include <linux/module.h> - #include <linux/ioport.h> - #include <linux/init.h> -Index: linux/drivers/scsi/pas16.c -=================================================================== ---- linux.orig/drivers/scsi/pas16.c 2016-01-03 16:03:49.000000000 +1100 -+++ linux/drivers/scsi/pas16.c 2016-01-03 16:04:00.000000000 +1100 -@@ -69,14 +69,10 @@ - - #include <linux/module.h> - --#include <linux/signal.h> --#include <linux/proc_fs.h> - #include <asm/io.h> - #include <asm/dma.h> - #include <linux/blkdev.h> --#include <linux/delay.h> - #include <linux/interrupt.h> --#include <linux/stat.h> - #include <linux/init.h> - - #include <scsi/scsi_host.h> -Index: linux/drivers/scsi/t128.c -=================================================================== ---- linux.orig/drivers/scsi/t128.c 2016-01-03 16:03:23.000000000 +1100 -+++ linux/drivers/scsi/t128.c 2016-01-03 16:04:00.000000000 +1100 -@@ -68,14 +68,11 @@ - * 15 9-11 - */ - --#include <linux/signal.h> - #include <linux/io.h> - #include <linux/blkdev.h> - #include <linux/interrupt.h> --#include <linux/stat.h> - #include <linux/init.h> - #include <linux/module.h> --#include <linux/delay.h> - - #include <scsi/scsi_host.h> - #include "t128.h" +An embedded and charset-unspecified text was scrubbed... +Name: ncr5380-move-core-driver-includes +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160103/0c4d4848/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index 965b27b..4083d23 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,260 +1,12 @@ "ref\020160103050501.042035135@telegraphics.com.au\0" - "From\0Finn Thain <fthain@telegraphics.com.au>\0" + "From\0fthain@telegraphics.com.au (Finn Thain)\0" "Subject\0[PATCH v4 45/78] ncr5380: Cleanup #include directives\0" "Date\0Sun, 03 Jan 2016 16:05:46 +1100\0" - "To\0James E.J. Bottomley <JBottomley@odin.com>" - Martin K. Petersen <martin.petersen@oracle.com> - Michael Schmitz <schmitzmic@gmail.com> - linux-m68k@vger.kernel.org - linux-scsi@vger.kernel.org - linux-kernel@vger.kernel.org - Russell King <linux@arm.linux.org.uk> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0ncr5380-move-core-driver-includes\0" "b\0" - "Remove unused includes (stat.h, signal.h, proc_fs.h) and move includes\n" - "needed by the core drivers into the common header (delay.h etc).\n" - "\n" - "Signed-off-by: Finn Thain <fthain@telegraphics.com.au>\n" - "Reviewed-by: Hannes Reinecke <hare@suse.com>\n" - "Tested-by: Ondrej Zary <linux@rainbow-software.org>\n" - "Tested-by: Michael Schmitz <schmitzmic@gmail.com>\n" - "\n" - "---\n" - " drivers/scsi/NCR5380.c | 2 --\n" - " drivers/scsi/NCR5380.h | 4 ++++\n" - " drivers/scsi/arm/cumana_1.c | 4 ----\n" - " drivers/scsi/arm/oak.c | 2 --\n" - " drivers/scsi/atari_NCR5380.c | 5 -----\n" - " drivers/scsi/atari_scsi.c | 1 -\n" - " drivers/scsi/dmx3191d.c | 5 -----\n" - " drivers/scsi/dtc.c | 4 +---\n" - " drivers/scsi/g_NCR5380.c | 6 ++----\n" - " drivers/scsi/mac_scsi.c | 1 -\n" - " drivers/scsi/pas16.c | 4 ----\n" - " drivers/scsi/t128.c | 3 ---\n" - " 12 files changed, 7 insertions(+), 34 deletions(-)\n" - "\n" - "Index: linux/drivers/scsi/NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.c\t2016-01-03 16:03:59.000000000 +1100\n" - "+++ linux/drivers/scsi/NCR5380.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -79,8 +79,6 @@\n" - " * 4. Test SCSI-II tagged queueing (I have no devices which support \n" - " * tagged queueing)\n" - " */\n" - "-#include <scsi/scsi_dbg.h>\n" - "-#include <scsi/scsi_transport_spi.h>\n" - " \n" - " #if (NDEBUG & NDEBUG_LISTS)\n" - " #define LIST(x,y) {printk(\"LINE:%d Adding %p to %p\\n\", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }\n" - "Index: linux/drivers/scsi/NCR5380.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.h\t2016-01-03 16:03:54.000000000 +1100\n" - "+++ linux/drivers/scsi/NCR5380.h\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -22,8 +22,12 @@\n" - " #ifndef NCR5380_H\n" - " #define NCR5380_H\n" - " \n" - "+#include <linux/delay.h>\n" - " #include <linux/interrupt.h>\n" - "+#include <linux/workqueue.h>\n" - "+#include <scsi/scsi_dbg.h>\n" - " #include <scsi/scsi_eh.h>\n" - "+#include <scsi/scsi_transport_spi.h>\n" - " \n" - " #define NDEBUG_ARBITRATION\t0x1\n" - " #define NDEBUG_AUTOSENSE\t0x2\n" - "Index: linux/drivers/scsi/arm/cumana_1.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/cumana_1.c\t2016-01-03 16:03:31.000000000 +1100\n" - "+++ linux/drivers/scsi/arm/cumana_1.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -4,9 +4,7 @@\n" - " * Copyright 1995-2002, Russell King\n" - " */\n" - " #include <linux/module.h>\n" - "-#include <linux/signal.h>\n" - " #include <linux/ioport.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/blkdev.h>\n" - " #include <linux/init.h>\n" - " \n" - "@@ -15,8 +13,6 @@\n" - " \n" - " #include <scsi/scsi_host.h>\n" - " \n" - "-#include <scsi/scsicam.h>\n" - "-\n" - " #define PSEUDO_DMA\n" - " \n" - " #define priv(host)\t\t\t((struct NCR5380_hostdata *)(host)->hostdata)\n" - "Index: linux/drivers/scsi/arm/oak.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/oak.c\t2016-01-03 16:03:31.000000000 +1100\n" - "+++ linux/drivers/scsi/arm/oak.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -5,9 +5,7 @@\n" - " */\n" - " \n" - " #include <linux/module.h>\n" - "-#include <linux/signal.h>\n" - " #include <linux/ioport.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/blkdev.h>\n" - " #include <linux/init.h>\n" - " \n" - "Index: linux/drivers/scsi/atari_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/atari_NCR5380.c\t2016-01-03 16:03:59.000000000 +1100\n" - "+++ linux/drivers/scsi/atari_NCR5380.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -68,9 +68,6 @@\n" - " \n" - " /* Adapted for the sun3 by Sam Creasey. */\n" - " \n" - "-#include <scsi/scsi_dbg.h>\n" - "-#include <scsi/scsi_transport_spi.h>\n" - "-\n" - " #if (NDEBUG & NDEBUG_LISTS)\n" - " #define LIST(x, y)\t\t\t\t\t\t\\\n" - " \tdo {\t\t\t\t\t\t\t\\\n" - "@@ -517,8 +514,6 @@ static inline int NCR5380_poll_politely(\n" - " \t reg, bit, val, wait);\n" - " }\n" - " \n" - "-#include <linux/delay.h>\n" - "-\n" - " #if NDEBUG\n" - " static struct {\n" - " \tunsigned char mask;\n" - "Index: linux/drivers/scsi/atari_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/atari_scsi.c\t2016-01-03 16:03:23.000000000 +1100\n" - "+++ linux/drivers/scsi/atari_scsi.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -66,7 +66,6 @@\n" - " \n" - " #include <linux/module.h>\n" - " #include <linux/types.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/blkdev.h>\n" - " #include <linux/interrupt.h>\n" - " #include <linux/init.h>\n" - "Index: linux/drivers/scsi/dmx3191d.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dmx3191d.c\t2016-01-03 16:03:23.000000000 +1100\n" - "+++ linux/drivers/scsi/dmx3191d.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -41,11 +41,6 @@\n" - " \n" - " #define NCR5380_implementation_fields\t/* none */\n" - " \n" - "-/*\n" - "- * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h)\n" - "- */\n" - "-#include <linux/delay.h>\n" - "-\n" - " #include \"NCR5380.h\"\n" - " #include \"NCR5380.c\"\n" - " \n" - "Index: linux/drivers/scsi/dtc.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dtc.c\t2016-01-03 16:03:54.000000000 +1100\n" - "+++ linux/drivers/scsi/dtc.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -46,15 +46,13 @@\n" - " \n" - " \n" - " #include <linux/module.h>\n" - "-#include <linux/signal.h>\n" - " #include <linux/blkdev.h>\n" - "-#include <linux/delay.h>\n" - "-#include <linux/stat.h>\n" - " #include <linux/string.h>\n" - " #include <linux/init.h>\n" - " #include <linux/interrupt.h>\n" - " #include <linux/io.h>\n" - " #include <scsi/scsi_host.h>\n" - "+\n" - " #include \"dtc.h\"\n" - " #define AUTOPROBE_IRQ\n" - " #include \"NCR5380.h\"\n" - "Index: linux/drivers/scsi/g_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/g_NCR5380.c\t2016-01-03 16:03:54.000000000 +1100\n" - "+++ linux/drivers/scsi/g_NCR5380.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -63,16 +63,14 @@\n" - " #endif\n" - " \n" - " #include <asm/io.h>\n" - "-#include <linux/signal.h>\n" - " #include <linux/blkdev.h>\n" - "+#include <linux/module.h>\n" - " #include <scsi/scsi_host.h>\n" - " #include \"g_NCR5380.h\"\n" - " #include \"NCR5380.h\"\n" - "-#include <linux/stat.h>\n" - " #include <linux/init.h>\n" - " #include <linux/ioport.h>\n" - " #include <linux/isapnp.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/interrupt.h>\n" - " \n" - " static int ncr_irq;\n" - "@@ -732,7 +730,7 @@ static struct scsi_host_template driver_\n" - " \t.cmd_per_lun \t= CMD_PER_LUN,\n" - " .use_clustering\t\t= DISABLE_CLUSTERING,\n" - " };\n" - "-#include <linux/module.h>\n" - "+\n" - " #include \"scsi_module.c\"\n" - " \n" - " module_param(ncr_irq, int, 0);\n" - "Index: linux/drivers/scsi/mac_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/mac_scsi.c\t2016-01-03 16:03:31.000000000 +1100\n" - "+++ linux/drivers/scsi/mac_scsi.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -12,7 +12,6 @@\n" - " */\n" - " \n" - " #include <linux/types.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/module.h>\n" - " #include <linux/ioport.h>\n" - " #include <linux/init.h>\n" - "Index: linux/drivers/scsi/pas16.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/pas16.c\t2016-01-03 16:03:49.000000000 +1100\n" - "+++ linux/drivers/scsi/pas16.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -69,14 +69,10 @@\n" - " \n" - " #include <linux/module.h>\n" - " \n" - "-#include <linux/signal.h>\n" - "-#include <linux/proc_fs.h>\n" - " #include <asm/io.h>\n" - " #include <asm/dma.h>\n" - " #include <linux/blkdev.h>\n" - "-#include <linux/delay.h>\n" - " #include <linux/interrupt.h>\n" - "-#include <linux/stat.h>\n" - " #include <linux/init.h>\n" - " \n" - " #include <scsi/scsi_host.h>\n" - "Index: linux/drivers/scsi/t128.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/t128.c\t2016-01-03 16:03:23.000000000 +1100\n" - "+++ linux/drivers/scsi/t128.c\t2016-01-03 16:04:00.000000000 +1100\n" - "@@ -68,14 +68,11 @@\n" - " * 15 9-11\n" - " */\n" - " \n" - "-#include <linux/signal.h>\n" - " #include <linux/io.h>\n" - " #include <linux/blkdev.h>\n" - " #include <linux/interrupt.h>\n" - "-#include <linux/stat.h>\n" - " #include <linux/init.h>\n" - " #include <linux/module.h>\n" - "-#include <linux/delay.h>\n" - " \n" - " #include <scsi/scsi_host.h>\n" - " #include \"t128.h\"" + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: ncr5380-move-core-driver-includes\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160103/0c4d4848/attachment.ksh> -e378373bcd6d6f9b09546a6e060c642731c3f0fc7281078c7a7cb16e9aae9b8a +5ca22a8978a2a8c329bca136065ac6b6588a51903a2918b68e5f08205e36e21f
diff --git a/a/content_digest b/N2/content_digest index 965b27b..cfd5ddb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,9 +5,9 @@ "To\0James E.J. Bottomley <JBottomley@odin.com>" Martin K. Petersen <martin.petersen@oracle.com> Michael Schmitz <schmitzmic@gmail.com> - linux-m68k@vger.kernel.org - linux-scsi@vger.kernel.org - linux-kernel@vger.kernel.org + <linux-m68k@vger.kernel.org> + <linux-scsi@vger.kernel.org> + <linux-kernel@vger.kernel.org> Russell King <linux@arm.linux.org.uk> " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" @@ -257,4 +257,4 @@ " #include <scsi/scsi_host.h>\n" " #include \"t128.h\"" -e378373bcd6d6f9b09546a6e060c642731c3f0fc7281078c7a7cb16e9aae9b8a +07d138db0f64704c2382f858919ce0287f6dec777c67c79ad92faa1bfaa82bac
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.