From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-misc tree with the amdgpu tree Date: Wed, 7 Aug 2019 13:09:33 +1000 Message-ID: <20190807130933.5491b647@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/A4XmEMqHWeGFkMo3c4SEgbH"; protocol="application/pgp-signature"; micalg=pgp-sha256 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Cc: Linux Next Mailing List , Linux Kernel Mailing List , Felix Kuehling , Gerd Hoffmann List-Id: intel-gfx@lists.freedesktop.org --Sig_/A4XmEMqHWeGFkMo3c4SEgbH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 274840e54422 ("drm/ttm: Add release_notify callback to ttm_bo_driver") from the amdgpu tree and commit: b96f3e7c8069 ("drm/ttm: use gem vma_node") from the drm-misc tree. I fixed it up (see below) 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 diff --cc drivers/gpu/drm/ttm/ttm_bo.c index 2070e8a57ed8,10a861a1690c..000000000000 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@@ -671,10 -672,7 +672,10 @@@ static void ttm_bo_release(struct kref=20 struct ttm_bo_device *bdev =3D bo->bdev; struct ttm_mem_type_manager *man =3D &bdev->man[bo->mem.mem_type]; =20 + if (bo->bdev->driver->release_notify) + bo->bdev->driver->release_notify(bo); + - drm_vma_offset_remove(&bdev->vma_manager, &bo->vma_node); + drm_vma_offset_remove(&bdev->vma_manager, &bo->base.vma_node); ttm_mem_io_lock(man, false); ttm_mem_io_free_vm(bo); ttm_mem_io_unlock(man); --Sig_/A4XmEMqHWeGFkMo3c4SEgbH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1KQO0ACgkQAVBC80lX 0GxX5gf9EiyGQuQKTqmoVHb32ms1y2mQHnrywmSJ2QEM4WDiAU/v5FZIMDujaYT1 x4LN7JF1x9SmAXyilwUoiGS3hvdd1uxPbjG82fmPtzAwzmfTF7yyRqYssulWU7hS A+zXjCie/UMNC1RuqGbt5MCBVWklNZiKixuT5is9Mi7Onevxg2Iu0FeMW6VAGtfr vxLX3+uo1ckbtR7LI3CUn/znCxwPDbh18FSatMnhnDsdISY8LD++wB4eIOt/av1g uzNNHhD9nl1s/Dmosmv4YGkY2KlE6wrYIxS6tojLUfp9wVj8a01uyggmxl8FvnP1 GEOK8g+4j0kebH1NGPOC74304eKmWg== =WAmQ -----END PGP SIGNATURE----- --Sig_/A4XmEMqHWeGFkMo3c4SEgbH--