Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
From: Thorsten Blum
Date: Wed May 29 2024 - 06:30:17 EST
On 27. May 2024, at 13:49, Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote:
> On 27/05/2024 11:27, Thorsten Blum wrote:
>> - Add missing newline before @return
>> - s/bytes/byte/
>> - s/handles/handle/
>>
>> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxxx>
>
> Do not attach (thread) your patchsets to some other threads (unrelated
> or older versions). This buries them deep in the mailbox and might
> interfere with applying entire sets.
>
>
> Applying: w1: Add missing newline and fix typos in w1_bus_master comment
> Applying: w1: Add missing newline and fix typos in w1_bus_master comment
> Patch failed at 0002 w1: Add missing newline and fix typos in
> w1_bus_master comment
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> error: patch failed: include/linux/w1.h:85
> error: include/linux/w1.h: patch does not apply
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
Hi Krzysztof,
just to clarify: do you want me to submit the patch again or did you run
"git am --skip" to skip the identical, but threaded resend?
Thanks,
Thorsten