* [PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
@ 2024-05-15 10:11 Thorsten Blum
2024-05-27 9:27 ` [RESEND PATCH] " Thorsten Blum
0 siblings, 1 reply; 6+ messages in thread
From: Thorsten Blum @ 2024-05-15 10:11 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: linux-kernel, 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
2024-05-15 10:11 [PATCH] w1: Add missing newline and fix typos in w1_bus_master comment Thorsten Blum
@ 2024-05-27 9:27 ` Thorsten Blum
2024-05-27 9:41 ` Krzysztof Kozlowski
2024-05-27 11:49 ` Krzysztof Kozlowski
0 siblings, 2 replies; 6+ messages in thread
From: Thorsten Blum @ 2024-05-27 9:27 UTC (permalink / raw)
To: thorsten.blum; +Cc: krzk, linux-kernel
- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
2024-05-27 9:27 ` [RESEND PATCH] " Thorsten Blum
@ 2024-05-27 9:41 ` Krzysztof Kozlowski
2024-05-27 10:09 ` Thorsten Blum
2024-05-27 11:49 ` Krzysztof Kozlowski
1 sibling, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2024-05-27 9:41 UTC (permalink / raw)
To: Thorsten Blum; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
2024-05-27 9:41 ` Krzysztof Kozlowski
@ 2024-05-27 10:09 ` Thorsten Blum
0 siblings, 0 replies; 6+ messages in thread
From: Thorsten Blum @ 2024-05-27 10:09 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
2024-05-27 9:27 ` [RESEND PATCH] " Thorsten Blum
2024-05-27 9:41 ` Krzysztof Kozlowski
@ 2024-05-27 11:49 ` Krzysztof Kozlowski
2024-05-27 12:30 ` Thorsten Blum
1 sibling, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2024-05-27 11:49 UTC (permalink / raw)
To: Thorsten Blum; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment
2024-05-27 11:49 ` Krzysztof Kozlowski
@ 2024-05-27 12:30 ` Thorsten Blum
0 siblings, 0 replies; 6+ messages in thread
From: Thorsten Blum @ 2024-05-27 12:30 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: linux-kernel
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-27 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-15 10:11 [PATCH] w1: Add missing newline and fix typos in w1_bus_master comment Thorsten Blum
2024-05-27 9:27 ` [RESEND PATCH] " Thorsten Blum
2024-05-27 9:41 ` Krzysztof Kozlowski
2024-05-27 10:09 ` Thorsten Blum
2024-05-27 11:49 ` Krzysztof Kozlowski
2024-05-27 12:30 ` Thorsten Blum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).