From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Feb 2015 18:36:45 +0000 (-0800)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: MMI-PSA29.97-13-9~10583
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b11a2783974791d37e44abbb48d41e8c120b5126;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'kconfig' of git://git./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
---

b11a2783974791d37e44abbb48d41e8c120b5126
diff --cc lib/Kconfig
index cb9758e0ba0c,75da4d3e2afd..87da53bb1fef
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -13,17 -13,8 +13,17 @@@ config RAID6_P
  config BITREVERSE
  	tristate
  
 +config HAVE_ARCH_BITREVERSE
 +	bool
 +	default n
 +	depends on BITREVERSE
 +	help
 +	  This option provides an config for the architecture which have instruction
 +	  can do bitreverse operation, we use the hardware instruction if the architecture
 +	  have this capability.
 +
  config RATIONAL
- 	boolean
+ 	bool
  
  config GENERIC_STRNCPY_FROM_USER
  	bool