2024-03-14 12:01:39

by Herve Codina

[permalink] [raw]
Subject: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

The make htmldoc command failed with the following error
... include/linux/bitmap.h:524: ERROR: Unexpected indentation.
... include/linux/bitmap.h:524: CRITICAL: Unexpected section title or transition.

Move the visual representation to a literal block.

Fixes: de5f84338970 ("lib/bitmap: Introduce bitmap_scatter() and bitmap_gather() helpers")
Reported-by: Stephen Rothwell <[email protected]>
Closes: https://lore.kernel.org/linux-kernel/[email protected]/
Signed-off-by: Herve Codina <[email protected]>
---

Changes v1 -> v2
Add Fixes, Reported-by and Closes tags

include/linux/bitmap.h | 44 ++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index fb3a9c93ac86..aa4096126553 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -522,17 +522,18 @@ static inline void bitmap_replace(unsigned long *dst,
*
* (Bits 0, 1, 2, 3, 4, 5 are copied to the bits 0, 1, 4, 8, 9, 12)
*
- * A more 'visual' description of the operation:
- * src: 0000000001011010
- * ||||||
- * +------+|||||
- * | +----+||||
- * | |+----+|||
- * | || +-+||
- * | || | ||
- * mask: ...v..vv...v..vv
- * ...0..11...0..10
- * dst: 0000001100000010
+ * A more 'visual' description of the operation::
+ *
+ * src: 0000000001011010
+ * ||||||
+ * +------+|||||
+ * | +----+||||
+ * | |+----+|||
+ * | || +-+||
+ * | || | ||
+ * mask: ...v..vv...v..vv
+ * ...0..11...0..10
+ * dst: 0000001100000010
*
* A relationship exists between bitmap_scatter() and bitmap_gather().
* bitmap_gather() can be seen as the 'reverse' bitmap_scatter() operation.
@@ -568,16 +569,17 @@ static inline void bitmap_scatter(unsigned long *dst, const unsigned long *src,
*
* (Bits 0, 1, 4, 8, 9, 12 are copied to the bits 0, 1, 2, 3, 4, 5)
*
- * A more 'visual' description of the operation:
- * mask: ...v..vv...v..vv
- * src: 0000001100000010
- * ^ ^^ ^ 0
- * | || | 10
- * | || > 010
- * | |+--> 1010
- * | +--> 11010
- * +----> 011010
- * dst: 0000000000011010
+ * A more 'visual' description of the operation::
+ *
+ * mask: ...v..vv...v..vv
+ * src: 0000001100000010
+ * ^ ^^ ^ 0
+ * | || | 10
+ * | || > 010
+ * | |+--> 1010
+ * | +--> 11010
+ * +----> 011010
+ * dst: 0000000000011010
*
* A relationship exists between bitmap_gather() and bitmap_scatter(). See
* bitmap_scatter() for the bitmap scatter detailed operations.
--
2.44.0



2024-03-14 13:14:43

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

On Thu, Mar 14, 2024 at 01:00:06PM +0100, Herve Codina wrote:
> The make htmldoc command failed with the following error
> ... include/linux/bitmap.h:524: ERROR: Unexpected indentation.
> ... include/linux/bitmap.h:524: CRITICAL: Unexpected section title or transition.
>
> Move the visual representation to a literal block.

Reviewed-by: Andy Shevchenko <[email protected]>

--
With Best Regards,
Andy Shevchenko



2024-03-15 07:43:35

by Bagas Sanjaya

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

On Thu, Mar 14, 2024 at 01:00:06PM +0100, Herve Codina wrote:
> diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
> index fb3a9c93ac86..aa4096126553 100644
> --- a/include/linux/bitmap.h
> +++ b/include/linux/bitmap.h
> @@ -522,17 +522,18 @@ static inline void bitmap_replace(unsigned long *dst,
> *
> * (Bits 0, 1, 2, 3, 4, 5 are copied to the bits 0, 1, 4, 8, 9, 12)
> *
> - * A more 'visual' description of the operation:
> - * src: 0000000001011010
> - * ||||||
> - * +------+|||||
> - * | +----+||||
> - * | |+----+|||
> - * | || +-+||
> - * | || | ||
> - * mask: ...v..vv...v..vv
> - * ...0..11...0..10
> - * dst: 0000001100000010
> + * A more 'visual' description of the operation::
> + *
> + * src: 0000000001011010
> + * ||||||
> + * +------+|||||
> + * | +----+||||
> + * | |+----+|||
> + * | || +-+||
> + * | || | ||
> + * mask: ...v..vv...v..vv
> + * ...0..11...0..10
> + * dst: 0000001100000010
> *
> * A relationship exists between bitmap_scatter() and bitmap_gather().
> * bitmap_gather() can be seen as the 'reverse' bitmap_scatter() operation.
> @@ -568,16 +569,17 @@ static inline void bitmap_scatter(unsigned long *dst, const unsigned long *src,
> *
> * (Bits 0, 1, 4, 8, 9, 12 are copied to the bits 0, 1, 2, 3, 4, 5)
> *
> - * A more 'visual' description of the operation:
> - * mask: ...v..vv...v..vv
> - * src: 0000001100000010
> - * ^ ^^ ^ 0
> - * | || | 10
> - * | || > 010
> - * | |+--> 1010
> - * | +--> 11010
> - * +----> 011010
> - * dst: 0000000000011010
> + * A more 'visual' description of the operation::
> + *
> + * mask: ...v..vv...v..vv
> + * src: 0000001100000010
> + * ^ ^^ ^ 0
> + * | || | 10
> + * | || > 010
> + * | |+--> 1010
> + * | +--> 11010
> + * +----> 011010
> + * dst: 0000000000011010
> *
> * A relationship exists between bitmap_gather() and bitmap_scatter(). See
> * bitmap_scatter() for the bitmap scatter detailed operations.

LGTM, thanks!

Reviewed-by: Bagas Sanjaya <[email protected]>

--
An old man doll... just what I always wanted! - Clara


Attachments:
(No filename) (2.35 kB)
signature.asc (235.00 B)
Download all attachments

2024-03-20 02:33:50

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

On Thu, 14 Mar 2024 13:00:06 +0100 Herve Codina wrote:
> The make htmldoc command failed with the following error
> ... include/linux/bitmap.h:524: ERROR: Unexpected indentation.
> ... include/linux/bitmap.h:524: CRITICAL: Unexpected section title or transition.
>
> Move the visual representation to a literal block.
>
> Fixes: de5f84338970 ("lib/bitmap: Introduce bitmap_scatter() and bitmap_gather() helpers")
> Reported-by: Stephen Rothwell <[email protected]>
> Closes: https://lore.kernel.org/linux-kernel/[email protected]/
> Signed-off-by: Herve Codina <[email protected]>

We took the offending commit via netdev, so I feel responsible. Please
LMK if anyone else is planning to apply this fix, otherwise we'll take
it and ship it to Linus on Thursday (19th).

2024-03-20 18:34:54

by Yury Norov

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

On Tue, Mar 19, 2024 at 07:33:38PM -0700, Jakub Kicinski wrote:
> On Thu, 14 Mar 2024 13:00:06 +0100 Herve Codina wrote:
> > The make htmldoc command failed with the following error
> > ... include/linux/bitmap.h:524: ERROR: Unexpected indentation.
> > ... include/linux/bitmap.h:524: CRITICAL: Unexpected section title or transition.
> >
> > Move the visual representation to a literal block.
> >
> > Fixes: de5f84338970 ("lib/bitmap: Introduce bitmap_scatter() and bitmap_gather() helpers")
> > Reported-by: Stephen Rothwell <[email protected]>
> > Closes: https://lore.kernel.org/linux-kernel/[email protected]/
> > Signed-off-by: Herve Codina <[email protected]>
>
> We took the offending commit via netdev, so I feel responsible. Please
> LMK if anyone else is planning to apply this fix, otherwise we'll take
> it and ship it to Linus on Thursday (19th).

Please go ahead and add my

Acked-by: Yury Norov <[email protected]>

2024-03-21 03:19:20

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

On Wed, 20 Mar 2024 11:34:40 -0700 Yury Norov wrote:
> > We took the offending commit via netdev, so I feel responsible. Please
> > LMK if anyone else is planning to apply this fix, otherwise we'll take
> > it and ship it to Linus on Thursday (19th).
>
> Please go ahead and add my
>
> Acked-by: Yury Norov <[email protected]>

Done, thank you!

2024-03-21 04:00:39

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

On Thu, 14 Mar 2024 13:00:06 +0100 you wrote:
> The make htmldoc command failed with the following error
> ... include/linux/bitmap.h:524: ERROR: Unexpected indentation.
> ... include/linux/bitmap.h:524: CRITICAL: Unexpected section title or transition.
>
> Move the visual representation to a literal block.
>
> Fixes: de5f84338970 ("lib/bitmap: Introduce bitmap_scatter() and bitmap_gather() helpers")
> Reported-by: Stephen Rothwell <[email protected]>
> Closes: https://lore.kernel.org/linux-kernel/[email protected]/
> Signed-off-by: Herve Codina <[email protected]>
>
> [...]

Here is the summary with links:
- [v2] lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc
https://git.kernel.org/netdev/net/c/2d9d9f256c8c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html