diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-11-20 21:26:59 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-11-20 21:26:59 -0500 |
| commit | 8e3b6345d113cc917e64b0349dc486b5d8f55e70 (patch) | |
| tree | 7489ad65d6f9ff43b9b251bd8828713684afafcf /drivers/char | |
| parent | 128faa1845a2d5b0178b986f3bd18fb38cc08cc2 (diff) | |
| parent | 54c814c8b23bc7617be3d46abdb896937695dbfa (diff) | |
Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging
Pull in the fixes branch to resolve conflict in UFS core.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions