From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: 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
Date: Tue, 21 Apr 2020 09:10:25 +0300 [thread overview]
Message-ID: <c299b6d5-a786-1620-2863-8814a1242cf8@ti.com> (raw)
In-Reply-To: <20200421115241.704f2fbf@canb.auug.org.au>
Hi,
On 21/04/2020 04:52, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc tree with the drm-misc-fixes tree
>
> drivers/gpu/drm/tidss/tidss_encoder.c
>
> between commit:
>
> 9da67433f64e ("drm/tidss: fix crash related to accessing freed memory")
>
> from the drm-misc-fixes tree and commit:
>
> b28ad7deb2f2 ("drm/tidss: Use simple encoder")
>
> from the drm-misc tree.
>
> I fixed it up (I just used the latter version of this file) and can
We need to use "drm/tidss: fix crash related to accessing freed memory" version.
> 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 have fixed this with drm-misc's dim tool, so I presume the conflict goes away when drm-misc-fixes
is merged to drm-fixes, and drm-fixes is then at some point merged to drm-misc-next.
It was a bit bad timing with the "drm/tidss: Use simple encoder", which removes the plumbing I
needed to implement the fix. So I effectively revert the "drm/tidss: Use simple encoder".
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2020-04-21 6:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 1:52 linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Stephen Rothwell
2020-04-21 6:10 ` Tomi Valkeinen [this message]
2020-04-23 3:17 ` Stephen Rothwell
2020-05-15 11:32 ` Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2023-01-27 2:28 Stephen Rothwell
2022-11-15 23:47 Stephen Rothwell
2022-11-16 0:25 ` Stephen Rothwell
2022-11-16 12:13 ` Christian König
2022-04-13 23:47 Stephen Rothwell
2022-04-14 6:33 ` Christian König
2022-04-26 1:48 ` Stephen Rothwell
2020-10-29 1:18 Stephen Rothwell
2017-07-18 1:39 Stephen Rothwell
2017-07-21 0:03 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c299b6d5-a786-1620-2863-8814a1242cf8@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).