On Tue, 03 Jan 2017, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel-fixes tree got a conflict in:
>
> drivers/gpu/drm/i915/gvt/kvmgt.c
>
> between commit:
>
> 99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces")
>
> from the vfio-fixes t
Hi all,
Today's linux-next merge of the drm-intel-fixes tree got a conflict in:
drivers/gpu/drm/i915/gvt/kvmgt.c
between commit:
99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces")
from the vfio-fixes tree and commit:
364fb6b789ff ("drm/i915/gvt/kvmgt: prevent d
