On 2021.05.12 09:47:39 -0300, Jason Gunthorpe wrote:
> On Wed, May 12, 2021 at 10:31:41AM +0800, Zhenyu Wang wrote:
> 
> > > This need to go into the vfio tree in some way, either directly
> > > through it, via rc or otherwise
> > 
> > As this is only for i915/gvt, once drm/i915 backmerge with linus master,
> > it should still go through normal i915/gvt merge path.
> 
> Don't do this, you will create conflicts with ongoing vfio work.
> 

Sure, there always could be conflict, which means you need to rebase onto
this cleanup. Would that a problem? I'd want to fix current workaround
in 5.13-rc.  Merging i915/gvt only change through vfio doesn't make sense
to me, I will handle that instead of Alex.

Thanks