2021-12-06 08:30:57

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build warning after merge of the driver-core tree

---

Hi all,

After merging the driver-core tree, today's linux-next build (htmldocs)
produced this warning:

Documentation/admin-guide/cputopology.rst:49: WARNING: Block quote ends without a blank line; unexpected unindent.

Introduced by commit

f1045056c726 ("topology/sysfs: rework book and drawer topology ifdefery")

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (488.00 B)
OpenPGP digital signature

2021-12-06 12:53:36

by Heiko Carstens

[permalink] [raw]

Subject: Re: linux-next: build warning after merge of the driver-core tree

---

On Mon, Dec 06, 2021 at 07:30:50PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (htmldocs)
> produced this warning:
>
> Documentation/admin-guide/cputopology.rst:49: WARNING: Block quote ends without a blank line; unexpected unindent.
>
> Introduced by commit
>
> f1045056c726 ("topology/sysfs: rework book and drawer topology ifdefery")

Thanks for reporting!

Greg, please find below a patch which fixes this. I added a full
changelog just in case you don't want to rebase your branch so it can
be applied on top, instead of being merged into the existing patch.

From 7450195242db825520efbddef5df6f337dbf686f Mon Sep 17 00:00:00 2001
From: Heiko Carstens <[email protected]>
Date: Mon, 6 Dec 2021 13:37:20 +0100
Subject: [PATCH] topology/sysfs: get rid of htmldoc warning

Stephen Rothwell reported the following warning caused by commit
f1045056c726 ("topology/sysfs: rework book and drawer topology
ifdefery"):

Documentation/admin-guide/cputopology.rst:49: WARNING: Block quote
ends without a blank line; unexpected unindent.

To fix this remove the extra indentation again.

Fixes: f1045056c726 ("topology/sysfs: rework book and drawer topology ifdefery")
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Heiko Carstens <[email protected]>
---
Documentation/admin-guide/cputopology.rst | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Documentation/admin-guide/cputopology.rst b/Documentation/admin-guide/cputopology.rst
index 677ba1c2c820..d29cacc9b3c3 100644
--- a/Documentation/admin-guide/cputopology.rst
+++ b/Documentation/admin-guide/cputopology.rst
@@ -37,15 +37,15 @@ To be consistent on all architectures, include/linux/topology.h
provides default definitions for any of the above macros that are
not defined by include/asm-XXX/topology.h:

- 1) topology_physical_package_id: -1
- 2) topology_die_id: -1
- 3) topology_cluster_id: -1
- 4) topology_core_id: 0
- 5) topology_book_id: -1
- 6) topology_drawer_id: -1
- 7) topology_sibling_cpumask: just the given CPU
- 8) topology_core_cpumask: just the given CPU
- 9) topology_cluster_cpumask: just the given CPU
+1) topology_physical_package_id: -1
+2) topology_die_id: -1
+3) topology_cluster_id: -1
+4) topology_core_id: 0
+5) topology_book_id: -1
+6) topology_drawer_id: -1
+7) topology_sibling_cpumask: just the given CPU
+8) topology_core_cpumask: just the given CPU
+9) topology_cluster_cpumask: just the given CPU
10) topology_die_cpumask: just the given CPU
11) topology_book_cpumask: just the given CPU
12) topology_drawer_cpumask: just the given CPU
--
2.32.0

2021-12-07 10:23:43

by Greg KH

[permalink] [raw]

Subject: Re: linux-next: build warning after merge of the driver-core tree

---

On Mon, Dec 06, 2021 at 07:30:50PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the driver-core tree, today's linux-next build (htmldocs)
> produced this warning:
>
> Documentation/admin-guide/cputopology.rst:49: WARNING: Block quote ends without a blank line; unexpected unindent.
>
> Introduced by commit
>
> f1045056c726 ("topology/sysfs: rework book and drawer topology ifdefery")
>

Thanks, I took Heiko's patch now to resolve this.

greg k-h