On Thu, 15 Apr 2021 10:08:55 -0300
Jason Gunthorpe <j...@ziepe.ca> 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:
> >
> > 9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev")
> >
> > from the drm tree and commit:
> >
> > 383987fd15ba ("vfio/gvt: Use mdev_get_type_group_id()")
> >
> > from the vfio tree.
> >
> > I fixed it up (I used the latter version) and can carry the fix as
> > necessary.
>
> Yes that is right, thank you
Yep, thanks!
Alex
