[SCSI] lpfc 8.1.2: Add ERROR and WARM_START modes for diagnostic purposes.

Add ERROR and WARM_START modes for diagnostic purposes.

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

diff --cc drivers/scsi/lpfc/lpfc.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_crtn.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_disc.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_hbadisc.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_hw.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_mbox.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge