diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 18:58:12 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 18:58:12 +0300 |
| commit | ec65e6beb02e09e34f3811dd85f7247da35edafc (patch) | |
| tree | ecaa55e109261b04d00d81add853f1ba20838523 /scripts/Makefile.host | |
| parent | 605ae389ea0243344713648294cd86b442d255ee (diff) | |
| parent | 258aad75c62146453d03028a44f2f1590d58e1f6 (diff) | |
| download | linux-ec65e6beb02e09e34f3811dd85f7247da35edafc.tar.xz | |
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>
Diffstat (limited to 'scripts/Makefile.host')
0 files changed, 0 insertions, 0 deletions