Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging
Merge the 5.15/scsi-fixes branch into the staging tree to resolve UFS
conflict reported by sfr.
Signed-off-by: 
Martin K. Petersen <martin.petersen@oracle.com>
Showing
- MAINTAINERS 0 additions, 7 deletionsMAINTAINERS
- block/bsg.c 15 additions, 8 deletionsblock/bsg.c
- drivers/scsi/arm/Kconfig 0 additions, 11 deletionsdrivers/scsi/arm/Kconfig
- drivers/scsi/arm/acornscsi.c 22 additions, 81 deletionsdrivers/scsi/arm/acornscsi.c
- drivers/scsi/arm/fas216.c 8 additions, 23 deletionsdrivers/scsi/arm/fas216.c
- drivers/scsi/arm/queue.c 1 addition, 1 deletiondrivers/scsi/arm/queue.c
- drivers/scsi/csiostor/csio_init.c 1 addition, 0 deletionsdrivers/scsi/csiostor/csio_init.c
- drivers/scsi/elx/efct/efct_lio.c 2 additions, 2 deletionsdrivers/scsi/elx/efct/efct_lio.c
- drivers/scsi/elx/efct/efct_scsi.c 1 addition, 2 deletionsdrivers/scsi/elx/efct/efct_scsi.c
- drivers/scsi/elx/libefc/efc_device.c 3 additions, 4 deletionsdrivers/scsi/elx/libefc/efc_device.c
- drivers/scsi/elx/libefc/efc_fabric.c 1 addition, 2 deletionsdrivers/scsi/elx/libefc/efc_fabric.c
- drivers/scsi/libiscsi.c 9 additions, 6 deletionsdrivers/scsi/libiscsi.c
- drivers/scsi/lpfc/lpfc_attr.c 4 additions, 6 deletionsdrivers/scsi/lpfc/lpfc_attr.c
- drivers/scsi/lpfc/lpfc_els.c 5 additions, 5 deletionsdrivers/scsi/lpfc/lpfc_els.c
- drivers/scsi/lpfc/lpfc_hw4.h 1 addition, 1 deletiondrivers/scsi/lpfc/lpfc_hw4.h
- drivers/scsi/lpfc/lpfc_init.c 10 additions, 10 deletionsdrivers/scsi/lpfc/lpfc_init.c
- drivers/scsi/lpfc/lpfc_nvme.c 0 additions, 2 deletionsdrivers/scsi/lpfc/lpfc_nvme.c
- drivers/scsi/lpfc/lpfc_scsi.c 2 additions, 7 deletionsdrivers/scsi/lpfc/lpfc_scsi.c
- drivers/scsi/lpfc/lpfc_sli.c 10 additions, 6 deletionsdrivers/scsi/lpfc/lpfc_sli.c
- drivers/scsi/megaraid/megaraid_sas_base.c 3 additions, 4 deletionsdrivers/scsi/megaraid/megaraid_sas_base.c
Loading
Please register or sign in to comment