Merge by Hand
James Bottomley [Sat, 5 Nov 2005 04:29:52 +0000 (22:29 -0600)]
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>

1  2 
drivers/scsi/ch.c
drivers/scsi/dec_esp.c
drivers/scsi/hosts.c
drivers/scsi/ide-scsi.c
drivers/scsi/osst.c
drivers/scsi/scsi_transport_fc.c
drivers/scsi/scsi_transport_iscsi.c
drivers/scsi/sg.c
drivers/scsi/st.c
include/scsi/scsi_transport_fc.h

Simple merge
@@@ -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 */
Simple merge
Simple merge
Simple merge
Simple merge
   * 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>
Simple merge
Simple merge
@@@ -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;