Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 15 Apr 2021 10:08:55 -0300
From:   Jason Gunthorpe <jgg@ziepe.ca>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Alex Williamson <alex.williamson@redhat.com>,
        Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>,
        Jani Nikula <jani.nikula@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the vfio tree with the drm tree
Message-ID: <20210415130855.GR227011@ziepe.ca>
References: <20210415164734.1143f20d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210415164734.1143f20d@canb.auug.org.au>
Precedence: bulk

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

Jason