Merge a0113b46 ("Merge patch series "scsi: bfa: Remove deadcode"") into android-mainline
Steps on the way to 6.13-rc1
Resolves merge conflicts in:
drivers/ufs/core/ufshcd.c
Change-Id: Ie9647cc4f0bd59ac126ebc79a9d3a9d251d3d27e
Signed-off-by:
Greg Kroah-Hartman <gregkh@google.com>
No related branches found
No related tags found
Showing
- drivers/message/fusion/mptlan.h 0 additions, 3 deletionsdrivers/message/fusion/mptlan.h
- drivers/scsi/aacraid/aacraid.h 0 additions, 1 deletiondrivers/scsi/aacraid/aacraid.h
- drivers/scsi/aacraid/commsup.c 0 additions, 121 deletionsdrivers/scsi/aacraid/commsup.c
- drivers/scsi/aic7xxx/aic7770.c 0 additions, 15 deletionsdrivers/scsi/aic7xxx/aic7770.c
- drivers/scsi/aic7xxx/aic7xxx.h 0 additions, 2 deletionsdrivers/scsi/aic7xxx/aic7xxx.h
- drivers/scsi/bfa/bfa.h 0 additions, 10 deletionsdrivers/scsi/bfa/bfa.h
- drivers/scsi/bfa/bfa_core.c 0 additions, 35 deletionsdrivers/scsi/bfa/bfa_core.c
- drivers/scsi/bfa/bfa_defs_fcs.h 0 additions, 22 deletionsdrivers/scsi/bfa/bfa_defs_fcs.h
- drivers/scsi/bfa/bfa_fcpim.c 0 additions, 9 deletionsdrivers/scsi/bfa/bfa_fcpim.c
- drivers/scsi/bfa/bfa_fcpim.h 0 additions, 1 deletiondrivers/scsi/bfa/bfa_fcpim.h
- drivers/scsi/bfa/bfa_fcs.h 0 additions, 12 deletionsdrivers/scsi/bfa/bfa_fcs.h
- drivers/scsi/bfa/bfa_fcs_lport.c 0 additions, 142 deletionsdrivers/scsi/bfa/bfa_fcs_lport.c
- drivers/scsi/bfa/bfa_fcs_rport.c 0 additions, 36 deletionsdrivers/scsi/bfa/bfa_fcs_rport.c
- drivers/scsi/bfa/bfa_ioc.c 0 additions, 21 deletionsdrivers/scsi/bfa/bfa_ioc.c
- drivers/scsi/bfa/bfa_ioc.h 0 additions, 2 deletionsdrivers/scsi/bfa/bfa_ioc.h
- drivers/scsi/bfa/bfa_modules.h 0 additions, 1 deletiondrivers/scsi/bfa/bfa_modules.h
- drivers/scsi/bfa/bfa_svc.c 0 additions, 72 deletionsdrivers/scsi/bfa/bfa_svc.c
- drivers/scsi/bfa/bfa_svc.h 0 additions, 5 deletionsdrivers/scsi/bfa/bfa_svc.h
- drivers/scsi/bfa/bfad.c 0 additions, 20 deletionsdrivers/scsi/bfa/bfad.c
- drivers/scsi/bfa/bfad_drv.h 0 additions, 1 deletiondrivers/scsi/bfa/bfad_drv.h
Loading
Please register or sign in to comment