Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Date:   Tue, 24 Oct 2023 11:52:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@redhat.com>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     DRI <dri-devel@lists.freedesktop.org>,
        Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Qi Zheng <zhengqi.arch@bytedance.com>,
        Rob Clark <robdclark@chromium.org>
Subject: linux-next: manual merge of the drm tree with the mm-stable tree
Message-ID: <20231024115206.4ce24d96@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/E6gZg8B3hDt_KoJXk83GE/s";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/gpu/drm/msm/msm_drv.c

between commit:

  cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker")

from the mm-stable tree and commit:

  506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c")

from the drm 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/msm/msm_drv.c
index 7f20249d6071,443bbc3ed750..000000000000
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -457,23 -265,12 +265,14 @@@ static int msm_drm_init(struct device *
  	if (ret)
  		goto err_deinit_vram;
 =20
- 	/* the fw fb could be anywhere in memory */
- 	ret =3D drm_aperture_remove_framebuffers(drv);
- 	if (ret)
- 		goto err_msm_uninit;
-=20
 -	msm_gem_shrinker_init(ddev);
 +	ret =3D msm_gem_shrinker_init(ddev);
 +	if (ret)
 +		goto err_msm_uninit;
 =20
  	if (priv->kms_init) {
- 		ret =3D priv->kms_init(ddev);
- 		if (ret) {
- 			DRM_DEV_ERROR(dev, "failed to load kms\n");
- 			priv->kms =3D NULL;
+ 		ret =3D msm_drm_kms_init(dev, drv);
+ 		if (ret)
  			goto err_msm_uninit;
- 		}
- 		kms =3D priv->kms;
  	} else {
  		/* valid only for the dummy headless case, where of_node=3DNULL */
  		WARN_ON(dev->of_node);

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU3FTYACgkQAVBC80lX
0Gwj/Qf+Nnq6P1WtH2q7Cgnqn4r9QcG4VJV0wqdU8SslgQlNtGCpqdLXSn/BN6sC
T8I2K3A8+dT1EPULcqZwWOQrnHjgaoQw0nCtACbGFJ2EYssxUHp7rxMPJwV7iVdM
KRaPMvSySfoYxvoBDPUPzfshIwjJUpgi7xUo7cjU9+sllJuP/dwk15fBdiK9zwTr
qQKYZr2HxxoAVu4BKX/ZeXvcdVxKqg0Iwl6CxamfEpuyAUM83jrDv6PCn0HQJSRF
I/YeHP2HIcBRZKptGWolRML2xjhEsNb4wGDsZvc4G5Jk3al4u/OyE7EW7fhEhnS+
qCHvJIcKuWiGMVzsafQ5iVq2aYDlJw==
=wpW6
-----END PGP SIGNATURE-----

--Sig_/E6gZg8B3hDt_KoJXk83GE/s--