[PATCH v2] Documentation: Avoid duplicate Kconfig inclusion

[PATCH v2] Documentation: Avoid duplicate Kconfig inclusion

[Peter Foley]

Documentation/Kconfig is already included from top-level, avoid
including it again from lib/Kconfig.debug.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
---
Changes in v2:
- Add a top-level Documentation entry instead of nesting under Kernel hacking
- Link to v1: https://lore.kernel.org/r/20230114-doc-v1-1-efec2689e423@pefoley.com
---
 Documentation/Kconfig | 10 ++++++++--
 lib/Kconfig.debug     |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Documentation/Kconfig b/Documentation/Kconfig
index 252bfc164dbdc..3a0e7ac0c4e32 100644
--- a/Documentation/Kconfig
+++ b/Documentation/Kconfig
@@ -1,6 +1,9 @@
+if COMPILE_TEST
+
+menu "Documentation"
+
 config WARN_MISSING_DOCUMENTS
 	bool "Warn if there's a missing documentation file"
-	depends on COMPILE_TEST
 	help
 	  It is not uncommon that a document gets renamed.
 	  This option makes the Kernel to check for missing dependencies,
@@ -11,7 +14,6 @@ config WARN_MISSING_DOCUMENTS
 
 config WARN_ABI_ERRORS
 	bool "Warn if there are errors at ABI files"
-	depends on COMPILE_TEST
 	help
 	  The files under Documentation/ABI should follow what's
 	  described at Documentation/ABI/README. Yet, as they're manually
@@ -20,3 +22,7 @@ config WARN_ABI_ERRORS
 	  scripts/get_abi.pl. Add a check to verify them.
 
 	  If unsure, select 'N'.
+
+endmenu
+
+endif
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 881c3f84e88a3..4bafc5ca51f20 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2872,6 +2872,4 @@ config RUST_BUILD_ASSERT_ALLOW
 
 endmenu # "Rust"
 
-source "Documentation/Kconfig"
-
 endmenu # Kernel hacking

---
base-commit: 5dc4c995db9eb45f6373a956eb1f69460e69e6d4
change-id: 20230114-doc-005df4ac8193

Best regards,
-- 
Peter Foley <pefoley2@pefoley.com>

Re: [PATCH v2] Documentation: Avoid duplicate Kconfig inclusion

[Randy Dunlap]

On 1/16/23 14:58, Peter Foley wrote:
> Documentation/Kconfig is already included from top-level, avoid
> including it again from lib/Kconfig.debug.
> 
> Signed-off-by: Peter Foley <pefoley2@pefoley.com>

Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
> Changes in v2:
> - Add a top-level Documentation entry instead of nesting under Kernel hacking
> - Link to v1: https://lore.kernel.org/r/20230114-doc-v1-1-efec2689e423@pefoley.com
> ---
>  Documentation/Kconfig | 10 ++++++++--
>  lib/Kconfig.debug     |  2 --
>  2 files changed, 8 insertions(+), 4 deletions(-)


-- 
~Randy

Re: [PATCH v2] Documentation: Avoid duplicate Kconfig inclusion

[Jonathan Corbet]

Peter Foley <pefoley2@pefoley.com> writes:

> Documentation/Kconfig is already included from top-level, avoid
> including it again from lib/Kconfig.debug.
>
> Signed-off-by: Peter Foley <pefoley2@pefoley.com>
> ---
> Changes in v2:
> - Add a top-level Documentation entry instead of nesting under Kernel hacking
> - Link to v1: https://lore.kernel.org/r/20230114-doc-v1-1-efec2689e423@pefoley.com
> ---
>  Documentation/Kconfig | 10 ++++++++--
>  lib/Kconfig.debug     |  2 --
>  2 files changed, 8 insertions(+), 4 deletions(-)

Applied, thanks.

jon