Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
drivers/vfio/pci/vfio_pci.c
between commits:
b8779475869a ("vgaarb: provide a vga_client_unregister wrapper")
f6b1772b2555 ("vgaarb: remove the unused irq_set_state argument to
vga_client_register")
bf44e8cecc03 ("vga
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
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
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
