Re: linux-next: manual merge of the vfio tree with the drm tree

2021-04-15 Thread Alex Williamson
On Thu, 15 Apr 2021 10:08:55 -0300 Jason Gunthorpe wrote: > On Thu, Apr 15, 2021 at 04:47:34PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the vfio tree got a conflict in: > > > > drivers/gpu/drm/i915/gvt/gvt.c > > > > between commit: > > > > 9ff06c38530

Re: linux-next: manual merge of the vfio tree with the drm tree

2021-04-15 Thread Jason Gunthorpe
On Thu, Apr 15, 2021 at 04:47:34PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the vfio tree got a conflict in: > > drivers/gpu/drm/i915/gvt/gvt.c > > between commit: > > 9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev") > > from the dr