linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jyri Sarha <jsarha@ti.com>
To: Frank Rowand <frowand.list@gmail.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Rob Herring <robherring2@gmail.com>,
	Rob Herring <robh@kernel.org>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: "airlied@linux.ie" <airlied@linux.ie>,
	"Valkeinen, Tomi" <tomi.valkeinen@ti.com>,
	Stephen Boyd <stephen.boyd@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Mark Brown <broonie@kernel.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Frank Rowand <frank.rowand@sony.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree
Date: Mon, 13 Nov 2017 21:51:29 +0200	[thread overview]
Message-ID: <6e7a5a3e-c5a9-7069-74bc-06037761af93@ti.com> (raw)
In-Reply-To: <917c5115-3d36-92bd-2713-5a6119fc82ca@gmail.com>

On 11/13/17 20:43, Frank Rowand wrote:
> 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.

Dave, Daniel? Would you take this late addition to v4.15 still, if I
would send a pull request now?

The patch is pretty much orthogonal to the rest of drm as it is only
dealing with device tree stuff.

Best regards,
Jyri

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2017-11-13 19:51 UTC|newest]

Thread overview: 9+ 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
2017-11-13 19:51       ` Jyri Sarha [this message]
2017-11-20  7:41         ` Daniel Vetter
2020-05-04  3:52 Stephen Rothwell
2020-07-22  5:52 Stephen Rothwell
2020-08-06  1:48 ` 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=6e7a5a3e-c5a9-7069-74bc-06037761af93@ti.com \
    --to=jsarha@ti.com \
    --cc=airlied@linux.ie \
    --cc=broonie@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=frank.rowand@sony.com \
    --cc=frowand.list@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=robherring2@gmail.com \
    --cc=sfr@canb.auug.org.au \
    --cc=stephen.boyd@linaro.org \
    --cc=tomi.valkeinen@ti.com \
    /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).