diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 03:36:54 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 03:52:58 +0100 |
| commit | 4d82e9db422ec34793650a34c5f03edd7b0abbaf (patch) | |
| tree | 59a8eda6e6f11f6226c5910c6f41695b964ca03e /lib/test_parman.c | |
| parent | scsi: qla2xxx: Remove redundant NULL check (diff) | |
| parent | scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit (diff) | |
| download | linux-4d82e9db422ec34793650a34c5f03edd7b0abbaf.tar.xz linux-4d82e9db422ec34793650a34c5f03edd7b0abbaf.zip | |
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue
The UFS core has received a substantial rework this cycle. This in
turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes
into 5.12/scsi-queue and resolve the conflict.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'lib/test_parman.c')
0 files changed, 0 insertions, 0 deletions