diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2022-11-04 11:11:30 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2022-11-04 11:11:30 +0200 |
| commit | d93618da6b6d453c6a9684a3460ffd51b9b4ef2e (patch) | |
| tree | 86faadcb14832a40ee8d8f22078f6f0c5492dc8a /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | 6f85403ef4d0034fff11c77ed170aa2130329544 (diff) | |
| parent | 60ba8c5bd94e17ab4b024f5cecf8b48e2cf36412 (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Needed to bring in v6.1-rc1 which contains commit f683b9d61319 ("i915: use the VMA iterator")
which is needed for series https://patchwork.freedesktop.org/series/110083/ .
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions