Re: (subset) [PATCH v2 0/6] use device_for_each_child_node() to access device child nodes

[Javier Carrasco <javier.carrasco.cruz@gmail.com>]

On 05/08/2024 16:33, Lee Jones wrote:
> On Mon, 05 Aug 2024, Lee Jones wrote:
> 
>> On Fri, 02 Aug 2024, Javier Carrasco wrote:
>>
>>> On 01/08/2024 14:39, Lee Jones wrote:
>>>> On Mon, 29 Jul 2024, Javier Carrasco wrote:
>>>>
>>>>> On 25/07/2024 18:28, Lee Jones wrote:
>>>>>> On Sun, 21 Jul 2024 17:19:00 +0200, Javier Carrasco wrote:
>>>>>>> This series aims to clarify the use cases of:
>>>>>>>
>>>>>>> - device_for_each_child_node[_scoped]()
>>>>>>> - fwnode_for_each_available_child_node[_scoped]()
>>>>>>>
>>>>>>> to access firmware nodes.
>>>>>>>
>>>>>>> [...]
>>>>>>
>>>>>> Applied, thanks!
>>>>>>
>>>>>> [3/6] leds: bd2606mvv: fix device child node usage in bd2606mvv_probe()
>>>>>>       commit: 75d2a77327c4917bb66163eea0374bb749428e9c
>>>>>> [4/6] leds: is31fl319x: use device_for_each_child_node_scoped() to access child nodes
>>>>>>       commit: 0f5a3feb60aba5d74f0b655cdff9c35aca03e81b
>>>>>> [5/6] leds: pca995x: use device_for_each_child_node() to access device child nodes
>>>>>>       (no commit info)
>>>>>>
>>>>>> --
>>>>>> Lee Jones [李琼斯]
>>>>>>
>>>>>
>>>>> Hi Lee,
>>>>>
>>>>> could you please tell me where you applied them? I rebased onto
>>>>> linux-next to prepare for v3, and these patches are still added on top
>>>>> of it. Can I find them in some leds/ branch? Thank you.
>>>>
>>>> Sorry, I was side-tracked before pushing.
>>>>
>>>> Pushed now.  They should be in -next tomorrow.
>>>>
>>>
>>> Thanks, I see
>>>
>>> [3/6] leds: bd2606mvv: fix device child node usage in bd2606mvv_probe()
>>>
>>> [4/6] leds: is31fl319x: use device_for_each_child_node_scoped() to
>>> access child nodes
>>>
>>> applied to -next, but
>>>
>>> [5/6] leds: pca995x: use device_for_each_child_node() to access device
>>> child nodes
>>>
>>> has not been applied yet.
>>
>> Yep, looks like b4 didn't like that one:
>>
>> [3/6] leds: bd2606mvv: fix device child node usage in bd2606mvv_probe()
>>       commit: 75d2a77327c4917bb66163eea0374bb749428e9c
>> [4/6] leds: is31fl319x: use device_for_each_child_node_scoped() to access child nodes
>>       commit: 0f5a3feb60aba5d74f0b655cdff9c35aca03e81b
>> [5/6] leds: pca995x: use device_for_each_child_node() to access device child nodes
>>       (no commit info)
>>
>> I'll try again and see if it can be pulled in.
>>
>> If not you'll have to resubmit it.
> 
> Now results in conflict:
> 
>     Applying patch(es)
>     Applying: leds: pca995x: use device_for_each_child_node() to access device child nodes
>     Using index info to reconstruct a base tree...
>     M	drivers/leds/leds-pca995x.c
>     Checking patch drivers/leds/leds-pca995x.c...
>     Applied patch drivers/leds/leds-pca995x.c cleanly.
>     Falling back to patching base and 3-way merge...
>     error: Your local changes to the following files would be overwritten by merge:
>     	drivers/leds/leds-pca995x.c
>     Please commit your changes or stash them before you merge.
>     Aborting
>     error: Failed to merge in the changes.
>     Patch failed at 0001 leds: pca995x: use device_for_each_child_node() to access device child nodes
>     hint: Use 'git am --show-current-patch=diff' to see the failed patch
>     hint: When you have resolved this problem, run "git am --continue".
>     hint: If you prefer to skip this patch, run "git am --skip" instead.
>     hint: To restore the original branch and stop patching, run "git am --abort".
>     hint: Disable this message with "git config advice.mergeConflict false"
>     
>     Failed to apply patches (fix and either hit return to continue or Ctrl+c to exit)
> 
> Please rebase and resubmit.
> 

Thank you for making the effort anyway, I will resubmit the patch.

Best regards,
Javier Carrasco