diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-11-06 20:37:45 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-11-06 20:37:45 -0500 |
| commit | 4b3b5815bcf3312539be569c2ffe702aa1f42153 (patch) | |
| tree | 0f4b64ea36dda154b7c6453dd71c43d854b3ed39 /net/unix/af_unix.c | |
| parent | 826d94a71597338e379076800f4d1ee81c5f3856 (diff) | |
| parent | cb7e509c4e0197f63717fee54fb41c4990ba8d3a (diff) | |
Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging
Pull in 6.12 fixes branch to resolve a merge conflict in ufs-mcq.c.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions