From: Jason Gunthorpe Date: Tue, 29 Nov 2022 20:42:27 +0000 (-0400) Subject: Merge tag 'v6.1-rc7' into iommufd.git for-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=90337f526c98129b0b180fc52dc5f57d8e7a8614;p=linux.git 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 --- 90337f526c98129b0b180fc52dc5f57d8e7a8614 diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c index f5164099c264e,714221f9a1315..6f107628ec385 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@@ -671,8 -669,12 +669,9 @@@ static int intel_vgpu_open_device(struc vgpu->attached = true; - kvmgt_protect_table_init(vgpu); - gvt_cache_init(vgpu); - vgpu->track_node.track_write = kvmgt_page_track_write; vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot; + kvm_get_kvm(vgpu->vfio_device.kvm); kvm_page_track_register_notifier(vgpu->vfio_device.kvm, &vgpu->track_node);