From c8ebfc888f9ee93f2dc7cd62b3be66263755d99a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 17:57:11 -0800 Subject: v2.4.1.2 -> v2.4.1.3 - Jens: better ordering of requests when unable to merge - Neil Brown: make md work as a module again (we cannot autodetect in modules, not enough background information) - Neil Brown: raid5 SMP locking cleanups - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and dentry leak fix - maestro3 shutdown fix - fix dcache hash calculation that could cause bad hashes under certain circumstances (Dean Gaudet) - David Miller: networking and sparc updates - Jeff Garzik: include file cleanups - Andy Grover: ACPI update - Coda-fs error return fixes - rth: alpha Jensen update --- drivers/scsi/53c7,8xx.c | 2 +- drivers/scsi/53c7xx.c | 2 +- drivers/scsi/NCR53C9x.c | 2 +- drivers/scsi/advansys.c | 2 +- drivers/scsi/aic7xxx.c | 2 +- drivers/scsi/blz1230.c | 2 +- drivers/scsi/blz2060.c | 2 +- drivers/scsi/cpqfcTScontrol.c | 2 +- drivers/scsi/cpqfcTSinit.c | 2 +- drivers/scsi/cpqfcTSworker.c | 2 +- drivers/scsi/cyberstorm.c | 2 +- drivers/scsi/cyberstormII.c | 2 +- drivers/scsi/dec_esp.c | 2 +- drivers/scsi/eata_dma.c | 2 +- drivers/scsi/eata_pio.c | 2 +- drivers/scsi/esp.c | 2 +- drivers/scsi/fastlane.c | 2 +- drivers/scsi/fcal.c | 2 +- drivers/scsi/ide-scsi.c | 2 +- drivers/scsi/ini9100u.c | 2 +- drivers/scsi/inia100.c | 2 +- drivers/scsi/ips.c | 2 +- drivers/scsi/jazz_esp.c | 2 +- drivers/scsi/mac53c94.c | 2 +- drivers/scsi/mac_esp.c | 2 +- drivers/scsi/mca_53c9x.c | 2 +- drivers/scsi/mesh.c | 2 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/oktagon_esp.c | 2 +- drivers/scsi/pci2220i.c | 2 +- drivers/scsi/pcmcia/aha152x_stub.c | 2 +- drivers/scsi/pcmcia/apa1480_stub.c | 2 +- drivers/scsi/pcmcia/fdomain_stub.c | 2 +- drivers/scsi/pcmcia/qlogic_stub.c | 2 +- drivers/scsi/pluto.c | 2 +- drivers/scsi/qla1280.c | 2 +- drivers/scsi/qlogicpti.c | 2 +- drivers/scsi/scsi.c | 2 +- drivers/scsi/scsi_error.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_merge.c | 2 +- drivers/scsi/scsi_obsolete.c | 2 +- drivers/scsi/scsi_proc.c | 2 +- drivers/scsi/scsi_queue.c | 2 +- drivers/scsi/scsi_syms.c | 2 +- drivers/scsi/sun3x_esp.c | 2 +- drivers/scsi/sym53c8xx.c | 2 +- drivers/scsi/wd7000.c | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/53c7,8xx.c b/drivers/scsi/53c7,8xx.c index 15ec102d6046..a84fb6f5fd03 100644 --- a/drivers/scsi/53c7,8xx.c +++ b/drivers/scsi/53c7,8xx.c @@ -229,7 +229,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c index 2ee80ae09b03..d47fc8ac967f 100644 --- a/drivers/scsi/53c7xx.c +++ b/drivers/scsi/53c7xx.c @@ -246,7 +246,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c index 0340ab5c44b8..5cf00e3ee02c 100644 --- a/drivers/scsi/NCR53C9x.c +++ b/drivers/scsi/NCR53C9x.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 69fec6b1499c..5f95838c4a8a 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -763,7 +763,7 @@ #include #include #include -#include +#include #include #if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0) #include diff --git a/drivers/scsi/aic7xxx.c b/drivers/scsi/aic7xxx.c index 8bb8cd96d99c..f8f8fcd64a88 100644 --- a/drivers/scsi/aic7xxx.c +++ b/drivers/scsi/aic7xxx.c @@ -256,7 +256,7 @@ #include #include -#include /* for kmalloc() */ +#include /* for kmalloc() */ #include /* for CONFIG_PCI */ diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c index 6872d7ca66bd..d7c13f7c1076 100644 --- a/drivers/scsi/blz1230.c +++ b/drivers/scsi/blz1230.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c index 77e3e4f116bd..12efb2891c91 100644 --- a/drivers/scsi/blz2060.c +++ b/drivers/scsi/blz2060.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/cpqfcTScontrol.c b/drivers/scsi/cpqfcTScontrol.c index bc90b51c3802..091deaf397b1 100644 --- a/drivers/scsi/cpqfcTScontrol.c +++ b/drivers/scsi/cpqfcTScontrol.c @@ -35,7 +35,7 @@ #include #include // request_region() prototype #include -#include // need "kfree" for ext. S/G pages +#include // need "kfree" for ext. S/G pages #include #include #include diff --git a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c index dac6954235b1..2d7ec816a7e3 100644 --- a/drivers/scsi/cpqfcTSinit.c +++ b/drivers/scsi/cpqfcTSinit.c @@ -1686,7 +1686,7 @@ int cpqfcTSGetLPSM( PTACHYON fcChip, char cErrorString[]) -#include "linux/malloc.h" +#include "linux/slab.h" // Dynamic memory allocation alignment routines // HP's Tachyon Fibre Channel Controller chips require diff --git a/drivers/scsi/cpqfcTSworker.c b/drivers/scsi/cpqfcTSworker.c index d3416ab6d7df..286cb0aeb013 100644 --- a/drivers/scsi/cpqfcTSworker.c +++ b/drivers/scsi/cpqfcTSworker.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c index 33150121c8ae..042b61d4734b 100644 --- a/drivers/scsi/cyberstorm.c +++ b/drivers/scsi/cyberstorm.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c index a1d53b314bc4..90e894f9878a 100644 --- a/drivers/scsi/cyberstormII.c +++ b/drivers/scsi/cyberstormII.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c index 25c3cad17346..97b140e8486d 100644 --- a/drivers/scsi/dec_esp.c +++ b/drivers/scsi/dec_esp.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/eata_dma.c b/drivers/scsi/eata_dma.c index 3431655d222e..3d587edce3f1 100644 --- a/drivers/scsi/eata_dma.c +++ b/drivers/scsi/eata_dma.c @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 0d890817cc2f..ce5b3800106e 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index 828c9e2903cb..655d46ad49b4 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c index bb7f89990beb..90d6555b0a03 100644 --- a/drivers/scsi/fastlane.c +++ b/drivers/scsi/fastlane.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c index 4ffef85617ad..36b017206932 100644 --- a/drivers/scsi/fcal.c +++ b/drivers/scsi/fcal.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 5d403105525d..444682a7a0fd 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/scsi/ini9100u.c b/drivers/scsi/ini9100u.c index 4dc0717c7e14..a6744560f181 100644 --- a/drivers/scsi/ini9100u.c +++ b/drivers/scsi/ini9100u.c @@ -136,7 +136,7 @@ #include "scsi.h" #include "sd.h" #include "hosts.h" -#include +#include #include "ini9100u.h" #ifdef DEBUG_i91u diff --git a/drivers/scsi/inia100.c b/drivers/scsi/inia100.c index 3adcc43cec4c..acd6081f26e6 100644 --- a/drivers/scsi/inia100.c +++ b/drivers/scsi/inia100.c @@ -89,7 +89,7 @@ #include "scsi.h" #include "sd.h" #include "hosts.h" -#include +#include #include "inia100.h" static Scsi_Host_Template driver_template = INIA100; diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index d98c57686479..173ef8498873 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -123,7 +123,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index 769a25b7d14d..8711c33f3e7d 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index ba29e33d8f2b..d57ce9d6814a 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index e96802127564..d1d38ec30cb2 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/mca_53c9x.c b/drivers/scsi/mca_53c9x.c index 6267a6189450..6d2ace9d76bc 100644 --- a/drivers/scsi/mca_53c9x.c +++ b/drivers/scsi/mca_53c9x.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index f80a7c4972bd..a1afb8e1cb73 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 3f8854aafeb4..d1f5bd1ad185 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c @@ -136,7 +136,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index 976a67dc692a..bdd779293034 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pci2220i.c b/drivers/scsi/pci2220i.c index 2b6d3122d2f3..50865ceadb45 100644 --- a/drivers/scsi/pci2220i.c +++ b/drivers/scsi/pci2220i.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index 75914a1a216d..2dad6515b4ba 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pcmcia/apa1480_stub.c b/drivers/scsi/pcmcia/apa1480_stub.c index 24ee469cdc2a..5ac3cf79f9c6 100644 --- a/drivers/scsi/pcmcia/apa1480_stub.c +++ b/drivers/scsi/pcmcia/apa1480_stub.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 3c480a3ca06b..c15aa191f23b 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 1cfee657fea4..c1f41e2ef276 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c index a0ca91c60b60..c651234dde7e 100644 --- a/drivers/scsi/pluto.c +++ b/drivers/scsi/pluto.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 50db38c9742a..cbf9140cbb34 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -220,7 +220,7 @@ END OF TERMS AND CONDITIONS #include "ql1280_fw.h" #include -#include /* for kmalloc() */ +#include /* for kmalloc() */ #ifndef KERNEL_VERSION diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index d471dddd9994..6466e7f84a11 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index cfd290c11860..877842224080 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 3d6e45fcdc36..87a44846de1e 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index dcde48437493..3dbdb6ca2c92 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_merge.c b/drivers/scsi/scsi_merge.c index 4ebadd868ebd..e7673c0803a2 100644 --- a/drivers/scsi/scsi_merge.c +++ b/drivers/scsi/scsi_merge.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_obsolete.c b/drivers/scsi/scsi_obsolete.c index 55adb72af27a..3b3990dfb0ef 100644 --- a/drivers/scsi/scsi_obsolete.c +++ b/drivers/scsi/scsi_obsolete.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index 3353a6aa7195..b486119b171e 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_queue.c b/drivers/scsi/scsi_queue.c index 4793f1e8bf94..c41f1ce06928 100644 --- a/drivers/scsi/scsi_queue.c +++ b/drivers/scsi/scsi_queue.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/scsi_syms.c b/drivers/scsi/scsi_syms.c index f0e85c70e5e3..b29e90e3cc92 100644 --- a/drivers/scsi/scsi_syms.c +++ b/drivers/scsi/scsi_syms.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c index 2a4d8e58d333..073dcf10c3ea 100644 --- a/drivers/scsi/sun3x_esp.c +++ b/drivers/scsi/sun3x_esp.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/sym53c8xx.c b/drivers/scsi/sym53c8xx.c index 917e51760223..f78641a9a857 100644 --- a/drivers/scsi/sym53c8xx.c +++ b/drivers/scsi/sym53c8xx.c @@ -126,7 +126,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index e7af1328bb9c..c4e5e98d73ad 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c @@ -151,7 +151,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3