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, 23 Apr 2020 13:17:27 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@linux.ie>
Cc:     Tomi Valkeinen <tomi.valkeinen@ti.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the drm-misc tree with the
 drm-misc-fixes tree
Message-ID: <20200423131727.1e0f2d9f@canb.auug.org.au>
In-Reply-To: <c299b6d5-a786-1620-2863-8814a1242cf8@ti.com>
References: <20200421115241.704f2fbf@canb.auug.org.au>
        <c299b6d5-a786-1620-2863-8814a1242cf8@ti.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AMvG1A0w1rTbKJfBVJzBQUh";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Tue, 21 Apr 2020 09:10:25 +0300 Tomi Valkeinen <tomi.valkeinen@ti.com> w=
rote:
>
> On 21/04/2020 04:52, Stephen Rothwell wrote:
> >=20
> > Today's linux-next merge of the drm-misc tree got a conflict in:he drm-=
misc tree with the drm-misc-fixes tree
> >=20
> >    drivers/gpu/drm/tidss/tidss_encoder.c
> >=20
> > between commit:
> >=20
> >    9da67433f64e ("drm/tidss: fix crash related to accessing freed memor=
y")
> >=20
> > from the drm-misc-fixes tree and commit:
> >=20
> >    b28ad7deb2f2 ("drm/tidss: Use simple encoder")
> >=20
> > from the drm-misc tree.
> >=20
> > I fixed it up (I just used the latter version of this file) and can =20
>=20
> We need to use "drm/tidss: fix crash related to accessing freed memory" v=
ersion.
>=20
> > 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
>=20
> I have fixed this with drm-misc's dim tool, so I presume the conflict goe=
s away when drm-misc-fixes=20
> is merged to drm-fixes, and drm-fixes is then at some point merged to drm=
-misc-next.
>=20
> It was a bit bad timing with the "drm/tidss: Use simple encoder", which r=
emoves the plumbing I=20
> needed to implement the fix. So I effectively revert the "drm/tidss: Use =
simple encoder".
>=20
>   Tomi
>=20

This is now a conflict between the drm and drm-misc-fixes trees.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6hCMcACgkQAVBC80lX
0Gx1HQf/ZbE+upiUXsPewgi3i1246+n4LMTaWEPrQRqedXUrDaUQco9CjpsFokVn
bvFHf5ZAtypMb7s9vAcLiniS4TCvDcZX1ouP2ACafaz8iQ3GauxlywggjuAkO4iz
HD5uoOcRVoELlEffWurIWO6FPx+2u4WOVz8vgwNthN2Krgc7a3BrxLJNi4uvKpVp
Tat/nquI1FznqxZOuLpR2a7NHXgVOD0ZIqX0CToEZY6uQ+OWjQZybESkaevRJrsw
Ru4wdq4BLHm24Gqgvypfh92ckMF9+CPbQgdw5i+2+y4X3b6pVhgKKrWOwfKHMm2+
xy0ceQXNkz4ds3Hpv6w6g4g8OTARTA==
=pewb
-----END PGP SIGNATURE-----

--Sig_/AMvG1A0w1rTbKJfBVJzBQUh--