Re: [PATCH v3] dt-bindings: timer: via,vt8500-timer: Convert to YAML

[Daniel Lezcano <daniel.lezcano@linaro.org>]

On 5/13/25 18:08, Alexey Charkov wrote:
> On Tue, May 13, 2025 at 7:49 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> On Tue, May 06, 2025 at 04:16:32PM +0400, Alexey Charkov wrote:
>>> Rewrite the textual description for the VIA/WonderMedia timer
>>> as YAML schema.
>>>
>>> The IP can generate up to four interrupts from four respective match
>>> registers, so reflect that in the schema.
>>>
>>> Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
>>> Signed-off-by: Alexey Charkov <alchark@gmail.com>
>>> ---
>>> Changes in v3:
>>> - Added Rob's review tag (thanks Rob)
>>> - Rebased on top of next-20250506 to pull in MAINTAINERS updates
>>> - Link to v2: https://lore.kernel.org/r/20250418-via_vt8500_timer_binding-v2-1-3c125568f028@gmail.com
>>>
>>> Changes in v2:
>>> - split out this binding change from the big series affecting multiple
>>>    subsystems unnecessarily (thanks Rob)
>>> - added description for the four possible interrupts (thanks Rob)
>>> - added overall description of the IC block
>>>
>>> Link to v1: https://lore.kernel.org/all/20250416-wmt-updates-v1-6-f9af689cdfc2@gmail.com/
>>> ---
>>
>> The patch does not apply.
>>
>> --- MAINTAINERS
>> +++ MAINTAINERS
>> @@ -3467,6 +3467,7 @@ F:        Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
>>   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
>>
>>          ^^^^^^ those bindings are not in my tree
> 
> This series is based on next-20250506. Happy to rebase onto 6.15-rc1,
> but these will result in a (trivial) conflict when merging the
> different trees into -next and to master. Please let me know if that's
> better.

Usually the conflicts are solved from bottom to top when trees are pulled.

If I solve the conflict at my level, it is probable another conflict 
will happen when the tree is pulled

Please rebase against v6.15-rc5

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog