Received-SPF: pass (google.com: domain of linux-kernel+bounces-54137-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Tue, 6 Feb 2024 12:06:43 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics
 <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>, Inki Dae
 <inki.dae@samsung.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Michael Trimarchi
 <michael@amarulasolutions.com>, Michael Walle <mwalle@kernel.org>, Robert
 Foss <rfoss@kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree
Message-ID: <20240206120643.1d30764c@canb.auug.org.au>
In-Reply-To: <20240206115956.4570e9b1@canb.auug.org.au>
References: <20240206115956.4570e9b1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/R5MrDFgjJgkcfwl1oGYogXX";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Tue, 6 Feb 2024 11:59:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>=20
>   drivers/gpu/drm/bridge/samsung-dsim.c
>=20
> between commit:
>=20
>   ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE")
>=20
> from Linus' tree and commit:
>=20
>   b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the ena=
ble() callback")
>=20
> from the drm-misc tree.
>=20
> I fixed it up (see below, please check) 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.

I changed my mind and just used the latter version of this file.
--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXBhiMACgkQAVBC80lX
0GxeKAgAkwQiFzWc9h4CfzDkViFqu8H/3j8jQCOL2MrI0BRFd//8tfIgFyEx7a3Y
NM6ij5nZP/7LrEELmOe7J/L8xBjhJel34x+aoKXlRFVtgUpauNQLYf8f4vL7CE1F
hP09q3GOWEMo9q+FyhmlZBBE7NDYFXtSPYm2pedIKe0VxrJtnMREtnn4nZ+vsaQn
wxdaWppYiN7eSLHc8dKE85tjr3sn6ILBDMLoRWgDX9EENec2Tnhc+HD7+cmt/OhF
yUiyenHVxTZwjeyUd0SPgT0jZHtklj5tRvO2/kT2xp3NC7yAgptFunRdtVBGbMoz
tSZeRFmfZOsf1V45x4vkJrSD+fgeCg==
=L2LP
-----END PGP SIGNATURE-----

--Sig_/R5MrDFgjJgkcfwl1oGYogXX--