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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/pwm/pwm-stm32.txt

between commit:

  56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-schema")

from the devicetree tree and commit:

  4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")

from the pwm tree.

I fixed it up (I just deleted the file - more fixup is probably required)
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

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

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

[Thierry Reding]

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

On Fri, Nov 15, 2019 at 03:44:56PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pwm tree got a conflict in:
> 
>   Documentation/devicetree/bindings/pwm/pwm-stm32.txt
> 
> between commit:
> 
>   56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-schema")
> 
> from the devicetree tree and commit:
> 
>   4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")
> 
> from the pwm tree.
> 
> I fixed it up (I just deleted the file - more fixup is probably required)
> 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.

It should be trivial to rewrite the sleep state patch on top of the
json-schema conversion and then take that version into the devicetree
tree.

Fabrice, can you resend that patch based on the devicetree tree?

Thierry

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

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

[Benjamin GAIGNARD]

On 11/15/19 10:41 AM, Thierry Reding wrote:
> On Fri, Nov 15, 2019 at 03:44:56PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the pwm tree got a conflict in:
>>
>>    Documentation/devicetree/bindings/pwm/pwm-stm32.txt
>>
>> between commit:
>>
>>    56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-schema")
>>
>> from the devicetree tree and commit:
>>
>>    4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")
>>
>> from the pwm tree.
>>
>> I fixed it up (I just deleted the file - more fixup is probably required)
>> 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.
> It should be trivial to rewrite the sleep state patch on top of the
> json-schema conversion and then take that version into the devicetree
> tree.
>
> Fabrice, can you resend that patch based on the devicetree tree?
Describing sleep state in json-schema is not need since it is included

by the "top" schema.

Benjamin

>
> Thierry

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  2b18eda58c86 ("dt-bindings: interrupt-controller: via,vt8500-intc: Convert to YAML")

from the devicetree tree and commit:

  b6b5683e9692 ("dt-bindings: pwm: vt8500-pwm: Convert to YAML")

from the pwm 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 MAINTAINERS
index b5c2ce4cb560,26ef29a0c9bf..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3453,7 -3428,7 +3453,8 @@@ M:	Krzysztof Kozlowski <krzk@kernel.org
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Odd Fixes
  F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 +F:	Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
+ F:	Documentation/devicetree/bindings/pwm/via,vt8500-pwm.yaml
  F:	arch/arm/boot/dts/vt8500/
  F:	arch/arm/mach-vt8500/
  F:	drivers/clocksource/timer-vt8500.c

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