leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging

Browse Source 
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>
This commit is contained in:
Martin K. Petersen
2021-10-12 11:58:12 -04:00
parent 605ae389ea 258aad75c6
commit ec65e6beb0
40 changed files with 335 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/scsi/scsi_device.h
View File

@@ -146,7 +146,6 @@ struct scsi_device {
struct scsi_vpd __rcu *vpd_pg83;
struct scsi_vpd __rcu *vpd_pg80;
struct scsi_vpd __rcu *vpd_pg89;
unsigned char current_tag; /* current tag */
struct scsi_target *sdev_target;
blist_flags_t sdev_bflags; /* black/white flags as also found in