diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2022-11-29 16:42:27 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-12-02 12:04:39 -0400 |
| commit | 90337f526c98129b0b180fc52dc5f57d8e7a8614 (patch) | |
| tree | d7458a03027cde56b8191f656dc5cdf1531a767d /lib/test_min_heap.c | |
| parent | 169dd5c987e60e62aa5785b30d22ded2ae000286 (diff) | |
| parent | b7b275e60bcd5f89771e865a8239325f86d9927d (diff) | |
| download | linux-90337f526c98129b0b180fc52dc5f57d8e7a8614.tar.bz2 | |
Merge tag 'v6.1-rc7' into iommufd.git for-next
Resolve conflicts in drivers/vfio/vfio_main.c by using the iommfd version.
The rc fix was done a different way when iommufd patches reworked this
code.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'lib/test_min_heap.c')
0 files changed, 0 insertions, 0 deletions