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 16:47:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Williamson <alex.williamson@redhat.com>,
        Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Jani Nikula <jani.nikula@intel.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the vfio tree with the drm tree
Message-ID: <20210415164734.1143f20d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/x=GVyj4HwY=icfJeVJ6Gf8Z";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/x=GVyj4HwY=icfJeVJ6Gf8Z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/x=GVyj4HwY=icfJeVJ6Gf8Z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmB34YYACgkQAVBC80lX
0GxlBwf9GwbxaLS1q+d0lcqr+GclIfWkGkY4xoLYvRlHqedpOJInqdwWb7tivxaA
n8p0o7wiQ04k+2FkSXz91q0VLardEbI9Q7/JUgFOhKd2XFVih4ibxjGMk946KINB
Z2U85LrdiLvKJwfgznX2uKJ4CnJm9yJV2K19FdmJoberb/Iq2RvsBpXX7TzSOY2d
5IxAwSLHR0k/O9NclVkPU/ajy1xDkkHwa4iMtVgwkFgYk4pnMejJH5b/GNSbCz0V
1Aar7icfTf++ru3vD5+8jPRr9dwNEwWNJnzUhSNv8P04RXSKgu7UnGR9ULAGVshh
4llM/LYsxqGYZ1Mi0XvbVG3JlJqXNA==
=Ag7H
-----END PGP SIGNATURE-----

--Sig_/x=GVyj4HwY=icfJeVJ6Gf8Z--