Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

diff --cc drivers/scsi/dec_esp.c
index 4f39890b44ac59c0867418c2562e9e73bc835bbc,2d7bde693d9616887d967b0751c43854500613bf..256d6baf8df3809fac23729cbd8e0719f8bb84b2
--- 1/drivers/scsi/dec_esp.c
--- 2/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@@ -228,10 -230,11 +230,11 @@@ static int dec_esp_detect(Scsi_Host_Tem
                        mem_start = get_tc_base_addr(slot);
  
                        /* Store base addr into esp struct */
 -                      esp->slot = mem_start;
 +                      esp->slot = CPHYSADDR(mem_start);
  
                        esp->dregs = 0;
-                       esp->eregs = (struct ESP_regs *) (mem_start + DEC_SCSI_SREG);
+                       esp->eregs = (void *)CKSEG1ADDR(mem_start +
+                                                       DEC_SCSI_SREG);
                        esp->do_pio_cmds = 1;
  
                        /* Set the command buffer */

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

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

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

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

diff --cc drivers/scsi/scsi_transport_iscsi.c
index d2caa35059d903625529efe8270916fb769a3303,d010aeda9d62021a4b7cf569150236fece68b594..49fd18c1a9c6d2d4daa433fd8b5ef15ff0ff8ae6
--- 1/drivers/scsi/scsi_transport_iscsi.c
--- 2/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@@ -19,9 -21,8 +21,11 @@@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  #include <linux/module.h>
 +#include <linux/string.h>
 +#include <linux/slab.h>
+ #include <linux/mempool.h>
+ #include <net/tcp.h>
 +
  #include <scsi/scsi.h>
  #include <scsi/scsi_host.h>
  #include <scsi/scsi_device.h>

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

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

diff --cc include/scsi/scsi_transport_fc.h
index c04405bead2d5f1482c98e3bba0c94657c05b259,319ff7a60dfe91fbdc8f95b0351d1193e392433e..fac547d32a98f112123ec4c2e35c59e2e1a586c4
--- 1/include/scsi/scsi_transport_fc.h
--- 2/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@@ -28,7 -28,7 +28,8 @@@
  #define SCSI_TRANSPORT_FC_H
  
  #include <linux/config.h>
 +#include <linux/sched.h>
+ #include <scsi/scsi.h>
  
  struct scsi_transport_template;