diff options
| author | Jason Gunthorpe <[email protected]> | 2023-08-15 13:01:26 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <[email protected]> | 2023-08-15 13:01:26 +0000 |
| commit | a35762dd14adb952442e487d8dad4bb50b614b2b (patch) | |
| tree | 4d21de11837f293860db8abbea8db161f1018edb /tools/perf/scripts/python/flamegraph.py | |
| parent | iommufd/selftest: Make the mock iommu driver into a real driver (diff) | |
| parent | Linux 6.5-rc6 (diff) | |
| download | kernel-a35762dd14adb952442e487d8dad4bb50b614b2b.tar.gz kernel-a35762dd14adb952442e487d8dad4bb50b614b2b.zip | |
Merge tag 'v6.5-rc6' into iommufd for-next
Required for following patches.
Resolve merge conflict by using the hunk from the for-next branch and
shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()
Signed-off-by: Jason Gunthorpe <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/flamegraph.py')
0 files changed, 0 insertions, 0 deletions