diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-15 05:51:29 +0300 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-15 05:51:29 +0300 |
commit | ac2beb4e3bd75b0049068516b9d42201bda0ded3 (patch) | |
tree | 09cedfe4495364c2e1114370e282b6028079a565 /drivers/scsi/lpfc/lpfc_init.c | |
parent | 22754f7fbb4030eb2d5e73c2a2db63637ed1d105 (diff) | |
parent | 5852ed2a6a39c862c8a3fdf646e1f4e01b91d710 (diff) | |
download | linux-ac2beb4e3bd75b0049068516b9d42201bda0ded3.tar.xz |
Merge branch '5.17/scsi-fixes' into 5.18/scsi-staging
Pull 5.17 fixes branch into 5.18 tree to resolve a few pm8001 driver
merge conflicts.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index f49ff18cb252..f5c363f663f6 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -2104,7 +2104,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba) } if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 && reg_err2 == SLIPORT_ERR2_REG_FW_RESTART) { - lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT, + lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "3143 Port Down: Firmware Update " "Detected\n"); en_rn_msg = false; |