sugar/linux
1
0
Fork 0
Code Activity

Merge ../linux-2.6/

Browse Source 
Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2006-06-28 14:06:39 -04:00
parent dc6a78f1af a39727f212
commit f28e71617d
1119 changed files with 51327 additions and 19522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/qla2xxx/qla_init.c
View File

@@ -2347,8 +2347,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
}
/* Remove device from the new list and add it to DB */
list_del(&fcport->list);
list_add_tail(&fcport->list, &ha->fcports);
list_move_tail(&fcport->list, &ha->fcports);
/* Login and update database */
qla2x00_fabric_dev_login(ha, fcport, &next_loopid);