Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[mirror_ubuntu-zesty-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 46f817abff0e60902e3e1b6c1c71b1a8355dc572..69886493ff1e3d31daa02d909447c744352b38ff 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -55,6 +55,7 @@ config CROSS_COMPILE
 
 config COMPILE_TEST
        bool "Compile also drivers which will not load"
 
 config COMPILE_TEST
        bool "Compile also drivers which will not load"

+       depends on !UML

        default n
        help
          Some drivers can be compiled on a different platform than they are
        default n
        help
          Some drivers can be compiled on a different platform than they are


@@ -80,6 +81,7 @@ config LOCALVERSION
 config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"
        default y
 config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"
        default y

+       depends on !COMPILE_TEST

        help
          This will try to automatically determine if the current tree is a
          release tree by looking for git tags that belong to the current
        help
          This will try to automatically determine if the current tree is a
          release tree by looking for git tags that belong to the current


@@ -952,7 +954,7 @@ menuconfig CGROUPS
          controls or device isolation.
          See
                - Documentation/scheduler/sched-design-CFS.txt  (CFS)
          controls or device isolation.
          See
                - Documentation/scheduler/sched-design-CFS.txt  (CFS)

-               - Documentation/cgroups/ (features for grouping, isolation
+               - Documentation/cgroup-v1/ (features for grouping, isolation

                                          and resource control)
 
          Say N if unsure.
                                          and resource control)
 
          Say N if unsure.


@@ -1009,7 +1011,7 @@ config BLK_CGROUP
        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
 
        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
 

-       See Documentation/cgroups/blkio-controller.txt for more information.
+       See Documentation/cgroup-v1/blkio-controller.txt for more information.

 
 config DEBUG_BLK_CGROUP
        bool "IO controller debugging"
 
 config DEBUG_BLK_CGROUP
        bool "IO controller debugging"


@@ -2078,7 +2080,7 @@ config TRIM_UNUSED_KSYMS
          (especially when using LTO) for optimizing the code and reducing
          binary size.  This might have some security advantages as well.
 
          (especially when using LTO) for optimizing the code and reducing
          binary size.  This might have some security advantages as well.
 

-         If unsure say N.
+         If unsure, or if you need to build out-of-tree modules, say N.

 
 endif # MODULES
 
 
 endif # MODULES