Re: linux-next: manual merge of the devicetree tree with the drm tree

[Stephen Rothwell]

Hi all,

On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell  
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 
> 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 
> ---
>  .../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=pdf
> +  
> https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86=pdf
>  
>  properties:
>compatible:
> -- 
> 2.27.0

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell


pgpn9JndYL3zH.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: manual merge of the devicetree tree with the drm tree

[Stephen Rothwell]

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 
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 
---
 .../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=pdf
+  
https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86=pdf
 
 properties:
   compatible:
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell


pgpEZ0WaIo8cc.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: manual merge of the devicetree tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/display/panel/panel-common.yaml

between commit:

  92e513fb0798 ("dt-bindings: display: grammar fixes in panel/")

from the drm tree and commit:

  3d21a4609335 ("dt-bindings: Remove cases of 'allOf' containing a '$ref'")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/display/panel/panel-common.yaml
index 17b8367f12dd,db3d270a33c6..
--- a/Documentation/devicetree/bindings/display/panel/panel-common.yaml
+++ b/Documentation/devicetree/bindings/display/panel/panel-common.yaml
@@@ -63,11 -61,10 +61,10 @@@ properties
  
display-timings:
  description:
 -  Some display panels supports several resolutions with different timing.
 +  Some display panels support several resolutions with different timings.
The display-timings bindings supports specifying several timings and
 -  optional specify which is the native mode.
 +  optionally specifying which is the native mode.
- allOf:
-   - $ref: display-timings.yaml#
+ $ref: display-timings.yaml#
  
# Connectivity
port:


pgpU0VAuamGA9.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the devicetree tree with the drm tree

[Daniel Vetter]

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 + Mark Brown  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..
>  --- 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
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the devicetree tree with the drm tree

[Frank Rowand]

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 + Mark Brown  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..
>>> --- 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
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the devicetree tree with the drm tree

[Jyri Sarha]

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 + Mark Brown  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..
 --- 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

Re: linux-next: manual merge of the devicetree tree with the drm tree

[Jyri Sarha]

On 11/13/17 07:58, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 30 Oct 2017 20:37:56 + Mark Brown  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..
>> --- 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
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the devicetree tree with the drm tree

[Stephen Rothwell]

Hi all,

On Mon, 30 Oct 2017 20:37:56 + Mark Brown  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..
> --- 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
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel