Skip to contentSkip to conversation

Documentation: Avoid duplicate Kconfig inclusion

PATCH Applied Peter Foley 3 participants 3 messages Jan 16, 2023 – Jan 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Documentation: Avoid duplicate Kconfig inclusion

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

---
Changes in v2:
- Add a top-level Documentation entry instead of nesting under Kernel hacking
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 Documentation/Kconfig | 10 ++++++++--
 lib/Kconfig.debug     |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)
Documentation/Kconfig +8 -2
index 252bfc164dbdc..3a0e7ac0c4e32 100644
@@ -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
lib/Kconfig.debug +0 -2
index 881c3f84e88a3..4bafc5ca51f20 100644
@@ -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,

Signature · 1 line
Peter Foley <[email protected]>
reviewer Acked-by Tested-by on v2 1/1
#1 lore raw
Quoted 4 lines · Peter Foley

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

Thanks.

Quoted 8 lines

---
Changes in v2:
- Add a top-level Documentation entry instead of nesting under Kernel hacking
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 Documentation/Kconfig | 10 ++++++++--
 lib/Kconfig.debug     |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
~Randy
maintainer Applied
#2 lore raw
In reply to Peter Foley
Quoted 4 lines · Peter Foley

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

Quoted 8 lines

---
Changes in v2:
- Add a top-level Documentation entry instead of nesting under Kernel hacking
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 Documentation/Kconfig | 10 ++++++++--
 lib/Kconfig.debug     |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

Applied, thanks.

jon