Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96130661 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-gregkh-3.9' of... 

Merge tag 'for-gregkh-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into driver-core-next

Kees writes:
   The current Acked set of patches for dropping CONFIG_EXPERIMENTAL.
parents 9931faca 483ea607

Documentation/CodingStyle

+1 −9
Original line number Diff line number Diff line
@@ -546,15 +546,7 @@ config AUDIT 
	  logging of avc messages output).  Does not do system-call

	  auditing without CONFIG_AUDITSYSCALL.



Features that might still be considered unstable should be defined as

dependent on "EXPERIMENTAL":



config SLUB

	depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT

	bool "SLUB (Unqueued Allocator)"

	...



while seriously dangerous features (such as write support for certain

Seriously dangerous features (such as write support for certain

filesystems) should advertise this prominently in their prompt string:



config ADFS_FS_RW

Documentation/DocBook/kernel-hacking.tmpl

+0 −7
Original line number Diff line number Diff line
@@ -1184,13 +1184,6 @@ static struct block_device_operations opt_fops = { 
     <filename>Documentation/kbuild/kconfig-language.txt</filename>.

    </para>



    <para>

     You may well want to make your CONFIG option only visible if

     <symbol>CONFIG_EXPERIMENTAL</symbol> is enabled: this serves as a

     warning to users.  There many other fancy things you can do: see

     the various <filename>Kconfig</filename> files for ideas.

    </para>



    <para>

     In your description of the option, make sure you address both the

     expert user and the user who knows nothing about your feature.  Mention

Documentation/DocBook/kgdb.tmpl

+2 −4
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ 
  <sect1 id="CompileKGDB">

    <title>Kernel config options for kgdb</title>

    <para>

    To enable <symbol>CONFIG_KGDB</symbol> you should first turn on

    "Prompt for development and/or incomplete code/drivers"

    (CONFIG_EXPERIMENTAL) in  "General setup", then under the

    "Kernel debugging" select "KGDB: kernel debugger".

    To enable <symbol>CONFIG_KGDB</symbol> you should look under

    "Kernel debugging" and select "KGDB: kernel debugger".

    </para>

    <para>

    While it is not a hard requirement that you have symbols in your

Documentation/intel_txt.txt

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ grub.conf needs to be modified as follows: 


The kernel option for enabling Intel TXT support is found under the

Security top-level menu and is called "Enable Intel(R) Trusted

Execution Technology (TXT)".  It is marked as EXPERIMENTAL and

Execution Technology (TXT)".  It is considered EXPERIMENTAL and

depends on the generic x86 support (to allow maximum flexibility in

kernel build options), since the tboot code will detect whether the

platform actually supports Intel TXT and thus whether any of the

Documentation/zh_CN/CodingStyle

+0 −7
Original line number Diff line number Diff line
@@ -462,13 +462,6 @@ config AUDIT 
	  logging of avc messages output).  Does not do system-call

	  auditing without CONFIG_AUDITSYSCALL.



仍然被认为不够稳定的功能应该被定义为依赖于“EXPERIMENTAL”：



config SLUB

	depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT

	bool "SLUB (Unqueued Allocator)"

	...



而那些危险的功能（比如某些文件系统的写支持）应该在它们的提示字符串里显著的声明这

一点：