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

Pull kconfig updates from Michal Marek:
 "This is the kconfig part of kbuild for v3.12-rc1:
   - post-3.11 search code fixes and micro-optimizations
   - CONFIG_MODULES is no longer a special case; this is needed to
     eventually fix the bug that using KCONFIG_ALLCONFIG breaks
     allmodconfig
   - long long is used to store hex and int values
   - make silentoldconfig no longer warns when a symbol changes from
     tristate to bool (it's a job for make oldconfig)
   - scripts/diffconfig updated to work with newer Pythons
   - scripts/config does not rely on GNU sed extensions"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: do not allow more than one symbol to have 'option modules'
  kconfig: regenerate bison parser
  kconfig: do not special-case 'MODULES' symbol
  diffconfig: Update script to support python versions 2.5 through 3.3
  diffconfig: Gracefully exit if the default config files are not present
  modules: do not depend on kconfig to set 'modules' option to symbol MODULES
  kconfig: silence warning when parsing auto.conf when a symbol has changed type
  scripts/config: use sed's POSIX interface
  kconfig: switch to "long long" for sanity
  kconfig: simplify symbol-search code
  kconfig: don't allocate n+1 elements in temporary array
  kconfig: minor style fixes in symbol-search code
  kconfig/[mn]conf: shorten title in search-box
  kconfig: avoid multiple calls to strlen
  Documentation/kconfig: more concise and straightforward search explanation

diff --combined init/Kconfig
index bfa9e13c9a939d34045bb8a360aef1743093b800,4d55e81deff014c6debd14ff1953e8289f4086f6..18bd9e3d327496b94c62e0c0555167ede4159148
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -470,7 -470,6 +470,7 @@@ config TREE_RC
  config TREE_PREEMPT_RCU
        bool "Preemptible tree-based hierarchical RCU"
        depends on PREEMPT
 +      select IRQ_WORK
        help
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
@@@ -528,29 -527,13 +528,29 @@@ config RCU_USER_Q
  config CONTEXT_TRACKING_FORCE
        bool "Force context tracking"
        depends on CONTEXT_TRACKING
 -      default CONTEXT_TRACKING
 +      default y if !NO_HZ_FULL
        help
 -        Probe on user/kernel boundaries by default in order to
 -        test the features that rely on it such as userspace RCU extended
 -        quiescent states.
 -        This test is there for debugging until we have a real user like the
 -        full dynticks mode.
 +        The major pre-requirement for full dynticks to work is to
 +        support the context tracking subsystem. But there are also
 +        other dependencies to provide in order to make the full
 +        dynticks working.
 +
 +        This option stands for testing when an arch implements the
 +        context tracking backend but doesn't yet fullfill all the
 +        requirements to make the full dynticks feature working.
 +        Without the full dynticks, there is no way to test the support
 +        for context tracking and the subsystems that rely on it: RCU
 +        userspace extended quiescent state and tickless cputime
 +        accounting. This option copes with the absence of the full
 +        dynticks subsystem by forcing the context tracking on all
 +        CPUs in the system.
 +
 +        Say Y only if you're working on the developpement of an
 +        architecture backend for the context tracking.
 +
 +        Say N otherwise, this option brings an overhead that you
 +        don't want in production.
 +
  
  config RCU_FANOUT
        int "Tree-based hierarchical RCU fanout value"
@@@ -972,7 -955,7 +972,7 @@@ config MEMCG_SWAP_ENABLE
          Memory Resource Controller Swap Extension comes with its price in
          a bigger memory consumption. General purpose distribution kernels
          which want to enable the feature but keep it disabled by default
 -        and let the user enable it by swapaccount boot command line
 +        and let the user enable it by swapaccount=1 boot command line
          parameter should have this option unselected.
          For those who want to have the feature enabled by default should
          select this option (if, for some reason, they need to disable it
@@@ -1123,6 -1106,7 +1123,6 @@@ config IPC_N
  
  config USER_NS
        bool "User namespace"
 -      depends on UIDGID_CONVERTED
        select UIDGID_STRICT_TYPE_CHECKS
  
        default n
@@@ -1156,8 -1140,20 +1156,8 @@@ config NET_N
  
  endif # NAMESPACES
  
 -config UIDGID_CONVERTED
 -      # True if all of the selected software conmponents are known
 -      # to have uid_t and gid_t converted to kuid_t and kgid_t
 -      # where appropriate and are otherwise safe to use with
 -      # the user namespace.
 -      bool
 -      default y
 -
 -      # Filesystems
 -      depends on XFS_FS = n
 -
  config UIDGID_STRICT_TYPE_CHECKS
        bool "Require conversions between uid/gids and their internal representation"
 -      depends on UIDGID_CONVERTED
        default n
        help
         While the nececessary conversions are being added to all subsystems this option allows
@@@ -1670,6 -1666,7 +1670,7 @@@ config BASE_SMAL
  
  menuconfig MODULES
        bool "Enable loadable module support"
+       option modules
        help
          Kernel modules are small pieces of compiled code which can
          be inserted in the running kernel, rather than being