[PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Thorsten Blum]

- Add missing newline before @return
- s/bytes/byte/
- s/handles/handle/

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 include/linux/w1.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/w1.h b/include/linux/w1.h
index 9a2a0ef39018..064805bfae3f 100644
--- a/include/linux/w1.h
+++ b/include/linux/w1.h
@@ -85,7 +85,8 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  *
  * @data: the first parameter in all the functions below
  *
- * @read_bit: Sample the line level @return the level read (0 or 1)
+ * @read_bit: Sample the line level
+ * @return the level read (0 or 1)
  *
  * @write_bit: Sets the line level
  *
@@ -95,7 +96,7 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  * touch_bit(1) = write-1 / read cycle
  * @return the bit read (0 or 1)
  *
- * @read_byte: Reads a bytes. Same as 8 touch_bit(1) calls.
+ * @read_byte: Reads a byte. Same as 8 touch_bit(1) calls.
  * @return the byte read
  *
  * @write_byte: Writes a byte. Same as 8 touch_bit(x) calls.
@@ -114,7 +115,7 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  * @set_pullup: Put out a strong pull-up pulse of the specified duration.
  * @return -1=Error, 0=completed
  *
- * @search: Really nice hardware can handles the different types of ROM search
+ * @search: Really nice hardware can handle the different types of ROM search
  * w1_master* is passed to the slave found callback.
  * u8 is search_type, W1_SEARCH or W1_ALARM_SEARCH
  *
-- 
2.45.0

[RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Thorsten Blum]

- Add missing newline before @return
- s/bytes/byte/
- s/handles/handle/

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 include/linux/w1.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/w1.h b/include/linux/w1.h
index 9a2a0ef39018..064805bfae3f 100644
--- a/include/linux/w1.h
+++ b/include/linux/w1.h
@@ -85,7 +85,8 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  *
  * @data: the first parameter in all the functions below
  *
- * @read_bit: Sample the line level @return the level read (0 or 1)
+ * @read_bit: Sample the line level
+ * @return the level read (0 or 1)
  *
  * @write_bit: Sets the line level
  *
@@ -95,7 +96,7 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  * touch_bit(1) = write-1 / read cycle
  * @return the bit read (0 or 1)
  *
- * @read_byte: Reads a bytes. Same as 8 touch_bit(1) calls.
+ * @read_byte: Reads a byte. Same as 8 touch_bit(1) calls.
  * @return the byte read
  *
  * @write_byte: Writes a byte. Same as 8 touch_bit(x) calls.
@@ -114,7 +115,7 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
  * @set_pullup: Put out a strong pull-up pulse of the specified duration.
  * @return -1=Error, 0=completed
  *
- * @search: Really nice hardware can handles the different types of ROM search
+ * @search: Really nice hardware can handle the different types of ROM search
  * w1_master* is passed to the slave found callback.
  * u8 is search_type, W1_SEARCH or W1_ALARM_SEARCH
  *
-- 
2.45.1

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Krzysztof Kozlowski]

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@toblux.com>

You sent a patch during merge window. It's waiting in the queue, so
timeout for pinging kind of started yesterday...

Best regards,
Krzysztof

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Thorsten Blum]

On 27. May 2024, at 11:41, Krzysztof Kozlowski <krzk@kernel.org> 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@toblux.com>
> 
> You sent a patch during merge window. It's waiting in the queue, so
> timeout for pinging kind of started yesterday...

Thanks, I didn't know that.

Best,
Thorsten

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Krzysztof Kozlowski]

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@toblux.com>

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


Best regards,
Krzysztof

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Thorsten Blum]

On 27. May 2024, at 13:49, Krzysztof Kozlowski <krzk@kernel.org> 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@toblux.com>
> 
> 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.

Ok thanks - didn't know that either.

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Thorsten Blum]

On 27. May 2024, at 13:49, Krzysztof Kozlowski <krzk@kernel.org> 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@toblux.com>
> 
> 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

Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment

[Krzysztof Kozlowski]

On 29/05/2024 12:29, Thorsten Blum wrote:
> On 27. May 2024, at 13:49, Krzysztof Kozlowski <krzk@kernel.org> 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@toblux.com>
>>
>> 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?

I run --skip, so patch is there. Should be already in the next. You just
don't get notification email, because `b4 ty` does not mark such case as
applied. No need for resend.

Best regards,
Krzysztof