Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 26 Jul 2023 11:10:18 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>,
        Dave Airlie <airlied@redhat.com>
Cc:     DRI <dri-devel@lists.freedesktop.org>,
        Alex Deucher <alexander.deucher@amd.com>,
        Christian =?UTF-8?B?S8O2bmln?= <christian.koenig@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm tree
Message-ID: <20230726111018.6a023a7d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GcJb70x6Xj5jHq4d7Cvw41N";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

between commit:

  8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2")

from the drm tree and commit:

  30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c")

from the amdgpu 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/amd/amdgpu/amdgpu_gem.c
index 7da871972a8e,992dfd3de49c..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -226,9 -229,6 +225,9 @@@ static void amdgpu_gem_object_close(str
  		goto out_unlock;
 =20
  	r =3D amdgpu_vm_clear_freed(adev, vm, &fence);
 +	if (unlikely(r < 0))
- 		dev_err(adev->dev, "failed to clear page "
- 			"tables on GEM object close (%ld)\n", r);
++		dev_err(adev->dev, "failed to clear page tables on GEM object close (%l=
d)\n",
++			r);
  	if (r || !fence)
  		goto out_unlock;
 =20

--Sig_/GcJb70x6Xj5jHq4d7Cvw41N
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTAcnoACgkQAVBC80lX
0GzdbAgAgDrIqg6GLxXBvoD801tI5aVqEARno9PYvGQtHs9Udzhu6k7B8yiMfswn
xnovXnIyBf2OTzgzawjbN8pdAG2UC2bXQjZvOCykQutIqHRRBVJ/nLbNMd2bIdGG
1d9emDP5uFhf9vDldFkQfDqvvQEomE+hhlRJGG72W4FOg4j834X7JFFZmOsCN6sM
hsokD/iHbfFSdSqlZbSyGAZjdyXDfnaz1Wj1fDjLeeEkHi+sXKQtnMMDd7TSviEn
DXplwdQ48lpQD5baOMsCtQB3z7X/ahg1hmwxG7Z/3s2/wb5EgxT6p+1ay49YXfzN
757MBtlRPIkFp08pneBd6rjPVkcYZw==
=tN22
-----END PGP SIGNATURE-----

--Sig_/GcJb70x6Xj5jHq4d7Cvw41N--