diff options
| author | Martin K. Petersen (Oracle) <mkp@kernel.org> | 2026-09-22 21:44:04 -0400 |
|---|---|---|
| committer | Martin K. Petersen (Oracle) <mkp@kernel.org> | 2026-09-22 21:44:04 -0400 |
| commit | 0b5b2fb484f3ba1b33ce8e1281ca172e3c8d1885 (patch) | |
| tree | db0d587d306cfe503d50ced6cb8d93767c143c20 /tools/perf/scripts/python | |
| parent | c3cff7fac01638ab58e85fe7df41a04fa25c5bae (diff) | |
| parent | df2908090cda368b01ff43709f51890076c56157 (diff) | |
| download | linux-next-0b5b2fb484f3ba1b33ce8e1281ca172e3c8d1885.tar.gz linux-next-0b5b2fb484f3ba1b33ce8e1281ca172e3c8d1885.zip | |
Merge tag 'v7.3-rc2' into 7.4/scsi-staging
Merge Linux 7.3-rc2 to resolve libata and mpi3mr merge conflicts.
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
Conflicts:
drivers/ata/libata-scsi.c
drivers/scsi/mpi3mr/mpi3mr_transport.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions