diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
| commit | 315480209b8e1032e63c70dafc8f4133b3c9a333 (patch) | |
| tree | a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d /fs/nfs/nfs3proc.c | |
| parent | 4cc0096e2d54bc31ead127be59e3a2d02a187ac9 (diff) | |
| parent | f0f82e2476f6adb9c7a0135cfab8091456990c99 (diff) | |
| download | linux-315480209b8e1032e63c70dafc8f4133b3c9a333.tar.bz2 | |
Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging
Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'fs/nfs/nfs3proc.c')
0 files changed, 0 insertions, 0 deletions