Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt
between commit:
5a2e9b658cdc ("dt-bindings: drm/bridge: ti-sn65dsi86: Convert to yaml")
from the drm tree and commit:
382646090f7f ("dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones")
from the devicetree tree.
I fixed it up (I delete the file and adde the following merge fix
patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Wed, 22 Jul 2020 15:47:22 +1000
Subject: [PATCH] fix for "dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones"
Signed-off-by: Stephen Rothwell <[email protected]>
---
.../devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
index be10e8cf31e1..f8622bd0f61e 100644
--- a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
@@ -11,7 +11,7 @@ maintainers:
description: |
The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs eDP.
- http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
+ https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
properties:
compatible:
--
2.27.0
--
Cheers,
Stephen Rothwell
Hi all,
On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell <[email protected]> wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt
>
> between commit:
>
> 5a2e9b658cdc ("dt-bindings: drm/bridge: ti-sn65dsi86: Convert to yaml")
>
> from the drm tree and commit:
>
> 382646090f7f ("dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones")
>
> from the devicetree tree.
>
> I fixed it up (I delete the file and adde the following merge fix
> patch) 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.
>
> From: Stephen Rothwell <[email protected]>
> Date: Wed, 22 Jul 2020 15:47:22 +1000
> Subject: [PATCH] fix for "dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones"
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> .../devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
> index be10e8cf31e1..f8622bd0f61e 100644
> --- a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
> +++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
> @@ -11,7 +11,7 @@ maintainers:
>
> description: |
> The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs eDP.
> - http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
> + https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf
>
> properties:
> compatible:
> --
> 2.27.0
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
On Mon, Nov 13, 2017 at 09:51:29PM +0200, Jyri Sarha wrote:
> 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 <[email protected]> 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.
Seems like a reasonable thing to include in the merge window -fixes pull
Dave usually does, just make sure all the acks are recorded.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
From 1583981798573695930@xxx Mon Nov 13 19:52:38 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
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 <[email protected]> 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
From 1583977585625606676@xxx Mon Nov 13 18:45:41 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
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 <[email protected]> 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
From 1583966109370068517@xxx Mon Nov 13 15:43:16 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
On 11/13/17 07:58, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 30 Oct 2017 20:37:56 +0000 Mark Brown <[email protected]> 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
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
From 1583929374269681685@xxx Mon Nov 13 05:59:23 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
Hi all,
On Mon, 30 Oct 2017 20:37:56 +0000 Mark Brown <[email protected]> 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.
--
Cheers,
Stephen Rothwell
From 1582716362758856630@xxx Mon Oct 30 20:39:05 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums