Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:
 "Yann E Morin was supposed to take over kconfig maintainership, but
  this hasn't happened.  So I'm sending a few kconfig patches that I
  collected:

   - Fix for missing va_end in kconfig
   - merge_config.sh displays used if given too few arguments
   - s/boolean/bool/ in Kconfig files for consistency, with the plan to
     only support bool in the future"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: use va_end to match corresponding va_start
  merge_config.sh: Display usage if given too few arguments
  kconfig: use bool instead of boolean for type definition attributes

2 files changed, 3 insertions, 3 deletions

diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig
index b76235ae4786..73c457bf5a4a 100644
--- a/security/integrity/Kconfig
+++ b/security/integrity/Kconfig
@@ -16,7 +16,7 @@ config INTEGRITY
 if INTEGRITY
 
 config INTEGRITY_SIGNATURE
-        boolean "Digital signature verification using multiple keyrings"
+        bool "Digital signature verification using multiple keyrings"
         depends on KEYS
         default n
         select SIGNATURE
@@ -30,7 +30,7 @@ config INTEGRITY_SIGNATURE
           usually only added from initramfs.
 
 config INTEGRITY_ASYMMETRIC_KEYS
-        boolean "Enable asymmetric keys support"
+        bool "Enable asymmetric keys support"
         depends on INTEGRITY_SIGNATURE
         default n
         select ASYMMETRIC_KEY_TYPE
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
index df586fa00ef1..bf19723cf117 100644
--- a/security/integrity/evm/Kconfig
+++ b/security/integrity/evm/Kconfig
@@ -1,5 +1,5 @@
 config EVM
-        boolean "EVM support"
+        bool "EVM support"
         select KEYS
         select ENCRYPTED_KEYS
         select CRYPTO_HMAC