Merge hch/dledford changes

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/hosts.h
index 14c75af9dcc1c32813c5b3d5cc8a55e810be4688,bb1878c991812e2993e8dff7f34898ea6ad75997..a6a1c79fd1db27fb98e8bc454638833936ab9809
--- 1/drivers/scsi/hosts.h
--- 2/drivers/scsi/hosts.h
+++ b/drivers/scsi/hosts.h
@@@ -543,13 -534,9 +534,9 @@@ static inline void scsi_set_pci_device(
   */
  extern void scan_scsis(struct Scsi_Host *, uint, uint, uint, uint);
  
- extern void scsi_mark_host_reset(struct Scsi_Host *);
- 
- #define BLANK_HOST {"", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
- 
  struct Scsi_Device_Template
  {
 -    struct Scsi_Device_Template * next;
 +    struct list_head list;
      const char * name;
      const char * tag;
      struct module * module;     /* Used for loadable modules */

diff --cc drivers/scsi/osst.c
Simple merge

diff --cc drivers/scsi/qla1280.c
Simple merge

diff --cc drivers/scsi/scsi.c
index b26208e58c698802e7f84ad587680af0c8f54e78,e9791f78f68d0e18692fb0a41355bcefd56bc468..67a2a74e0d18346a54665b0726cbffff2856c820
--- 1/drivers/scsi/scsi.c
--- 2/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@@ -2396,9 -2704,20 +2696,19 @@@ static int __init init_scsi(void
        generic = create_proc_info_entry ("scsi/scsi", 0, 0, scsi_proc_info);
        if (!generic) {
                printk (KERN_ERR "cannot init /proc/scsi/scsi\n");
 -              remove_proc_entry("scsi", 0);
 -              return -ENOMEM;
 +              goto out_proc_error;
        }
        generic->write_proc = proc_scsi_gen_write;
+ 
+       generic = create_proc_info_entry ("scsi/device_info", 0, 0,
+                                         proc_scsi_dev_info_read);
+       if (!generic) {
+               printk (KERN_ERR "cannot init /proc/scsi/device_info\n");
+               remove_proc_entry("scsi/scsi", 0);
+               remove_proc_entry("scsi", 0);
+               return -ENOMEM;
+       }
+       generic->write_proc = proc_scsi_dev_info_write;
  #endif
  
          scsi_devfs_handle = devfs_mk_dir (NULL, "scsi", NULL);

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge