From: Frank Rowand <frowand.list@gmail•com>
To: Jyri Sarha <jsarha@ti•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Rob Herring <robherring2@gmail•com>,
Rob Herring <robh@kernel•org>, ave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>
Cc: Mark Brown <broonie@kernel•org>,
Frank Rowand <frank.rowand@sony•com>,
Stephen Boyd <stephen.boyd@linaro•org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree
Date: Mon, 13 Nov 2017 10:43:35 -0800 [thread overview]
Message-ID: <917c5115-3d36-92bd-2713-5a6119fc82ca@gmail.com> (raw)
In-Reply-To: <153e4593-2ebb-c091-49c8-b8d44d5caeb5@ti.com>
Hi Jyri,
On 11/13/17 07:40, Jyri Sarha wrote:
> On 11/13/17 07:58, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Mon, 30 Oct 2017 20:37:56 +0000 Mark Brown <broonie@kernel•org> wrote:
>>>
>>> Today's linux-next merge of the devicetree tree got a conflict in:
>>>
>>> drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
>>>
>>> between commit:
>>>
>>> 44cd3939c111b7 ("drm/tilcdc: Remove redundant OF_DETACHED flag setting")
>>>
>>> from the drm tree and commit:
>>>
>>> f948d6d8b792bb ("of: overlay: avoid race condition between applying multiple overlays")
>>>
>>> from the devicetree 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.
>>>
>>> diff --cc drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
>>> index 482299a6f3b0,54025af534d4..000000000000
>>> --- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
>>> +++ b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
>>> @@@ -163,12 -162,8 +162,6 @@@ static struct device_node * __init tilc
>>> return NULL;
>>> }
>>>
>>> - ret = of_resolve_phandles(overlay);
>>> - if (ret) {
>>> - pr_err("%s: Failed to resolve phandles: %d\n", __func__, ret);
>>> - return NULL;
>>> - }
>>> - of_node_set_flag(overlay, OF_DETACHED);
>>> --
>>> return overlay;
>>> }
>>>
>>
>> Just a reminder that this conflict still exists.
>>
>
> After some consideration, I think we can drop the dts backward
> compatibility code from drm/tilcdc. It seems that it is causing a lot of
> trouble and I do not even know if anybody uses it anymore. Here is a
> patch for dropping it:
>
> https://lists.freedesktop.org/archives/dri-devel/2017-November/157394.html
>
> I did not plan to merge it before v4.16, but if this is a bigger problem
> I can push is right now for v4.15.
>
> Best regards,
> Jyri
>
The dropping patch is much appreciated.
It would make life easier for me if the patch gets into v4.15-rc.
-Frank
next prev parent reply other threads:[~2017-11-13 18:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 20:37 linux-next: manual merge of the devicetree tree with the drm tree Mark Brown
2017-11-13 5:58 ` Stephen Rothwell
2017-11-13 15:40 ` Jyri Sarha
2017-11-13 18:43 ` Frank Rowand [this message]
2017-11-13 19:51 ` Jyri Sarha
2017-11-20 7:41 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2020-05-04 3:52 Stephen Rothwell
2020-07-22 5:52 Stephen Rothwell
2020-08-06 1:48 ` Stephen Rothwell
2024-05-14 4:12 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=917c5115-3d36-92bd-2713-5a6119fc82ca@gmail.com \
--to=frowand.list@gmail$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=broonie@kernel$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=frank.rowand@sony$(echo .)com \
--cc=jsarha@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stephen.boyd@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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