linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the devicetree tree with the drm tree
@ 2017-10-30 20:37 Mark Brown
  2017-11-13  5:58 ` Stephen Rothwell
  0 siblings, 1 reply; 10+ messages in thread
From: Mark Brown @ 2017-10-30 20:37 UTC (permalink / raw)
  To: Rob Herring, Frank Rowand, Rob Herring, Stephen Boyd, Jyri Sarha
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

Hi Rob,

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;
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  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
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2017-11-13  5:58 UTC (permalink / raw)
  To: Rob Herring, Rob Herring, ave Airlie, DRI
  Cc: Mark Brown, Frank Rowand, Stephen Boyd, Jyri Sarha,
	Linux-Next Mailing List, Linux Kernel Mailing List

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.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  2017-11-13  5:58 ` Stephen Rothwell
@ 2017-11-13 15:40   ` Jyri Sarha
  2017-11-13 18:43     ` Frank Rowand
  0 siblings, 1 reply; 10+ messages in thread
From: Jyri Sarha @ 2017-11-13 15:40 UTC (permalink / raw)
  To: Stephen Rothwell, Rob Herring, Rob Herring, ave Airlie, DRI
  Cc: Stephen Boyd, Mark Brown, Linux-Next Mailing List, Frank Rowand,
	Linux Kernel Mailing List

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

-- 
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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  2017-11-13 15:40   ` Jyri Sarha
@ 2017-11-13 18:43     ` Frank Rowand
  2017-11-13 19:51       ` Jyri Sarha
  0 siblings, 1 reply; 10+ messages in thread
From: Frank Rowand @ 2017-11-13 18:43 UTC (permalink / raw)
  To: Jyri Sarha, Stephen Rothwell, Rob Herring, Rob Herring, ave Airlie, DRI
  Cc: Mark Brown, Frank Rowand, Stephen Boyd, Linux-Next Mailing List,
	Linux Kernel Mailing List

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  2017-11-13 18:43     ` Frank Rowand
@ 2017-11-13 19:51       ` Jyri Sarha
  2017-11-20  7:41         ` Daniel Vetter
  0 siblings, 1 reply; 10+ messages in thread
From: Jyri Sarha @ 2017-11-13 19:51 UTC (permalink / raw)
  To: Frank Rowand, Stephen Rothwell, Rob Herring, Rob Herring, DRI
  Cc: airlied, Valkeinen, Tomi, Stephen Boyd,
	Linux Kernel Mailing List, Mark Brown, Linux-Next Mailing List,
	Frank Rowand

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  2017-11-13 19:51       ` Jyri Sarha
@ 2017-11-20  7:41         ` Daniel Vetter
  0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2017-11-20  7:41 UTC (permalink / raw)
  To: Jyri Sarha
  Cc: Stephen Rothwell, ave Airlie, Valkeinen, Tomi, Stephen Boyd,
	Linux Kernel Mailing List, DRI, Mark Brown, Rob Herring,
	Linux-Next Mailing List, Frank Rowand, Frank Rowand

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 <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.

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the devicetree tree with the drm tree
@ 2024-05-14  4:12 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2024-05-14  4:12 UTC (permalink / raw)
  To: Rob Herring, Dave Airlie
  Cc: DRI, Krzysztof Kozlowski, Linux Kernel Mailing List,
	Linux Next Mailing List, Neil Armstrong

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml

between commit:

  90ed42ceda76 ("dt-bindings: display: novatek, nt36523: define ports")

from the drm tree and commit:

  9fa6bcf23e44 ("dt-bindings: display: panel: constrain 'reg' in DSI panels")

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/novatek,nt36523.yaml
index bbeea8cfa5fb,0447ee724947..000000000000
--- a/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+++ b/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
@@@ -34,7 -40,7 +37,6 @@@ properties
    vddio-supply:
      description: regulator that supplies the I/O voltage
  
-   reg: true
 -  ports: true
    rotation: true
    backlight: true
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the drm tree
  2020-07-22  5:52 Stephen Rothwell
@ 2020-08-06  1:48 ` Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-08-06  1:48 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Rob Herring, Linux Next Mailing List, Linux Kernel Mailing List,
	Douglas Anderson, Sam Ravnborg, Alexander A. Klimov

[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]

Hi all,

On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  .../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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the devicetree tree with the drm tree
@ 2020-07-22  5:52 Stephen Rothwell
  2020-08-06  1:48 ` Stephen Rothwell
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2020-07-22  5:52 UTC (permalink / raw)
  To: Rob Herring, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Douglas Anderson, Sam Ravnborg, Alexander A. Klimov

[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 .../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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the devicetree tree with the drm tree
@ 2020-05-04  3:52 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-05-04  3:52 UTC (permalink / raw)
  To: Rob Herring, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sam Ravnborg

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

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..000000000000
--- 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:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-05-14  4:12 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
2024-05-14  4:12 Stephen Rothwell

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).