+ init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch added to -mm tree

+ init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch added to -mm tree

[akpm]

Subject: + init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch added to -mm tree
To: pefoley2@pefoley.com,dhowells@redhat.com,stable@vger.kernel.org
From: akpm@linux-foundation.org
Date: Tue, 15 Apr 2014 12:56:33 -0700


The patch titled
     Subject: init/Kconfig: move the trusted keyring config option to general setup
has been added to the -mm tree.  Its filename is
     init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/init-kconfig-move-the-trusted-keyring-config-option-to-general-setup.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Peter Foley <pefoley2@pefoley.com>
Subject: init/Kconfig: move the trusted keyring config option to general setup

The SYSTEM_TRUSTED_KEYRING config option is not in any menu, causing it to
show up in the toplevel of the kernel configuration.  Fix this by moving
it under the General Setup menu.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Cc: David Howells <dhowells@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 init/Kconfig |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff -puN init/Kconfig~init-kconfig-move-the-trusted-keyring-config-option-to-general-setup init/Kconfig
--- a/init/Kconfig~init-kconfig-move-the-trusted-keyring-config-option-to-general-setup
+++ a/init/Kconfig
@@ -1646,6 +1646,18 @@ config MMAP_ALLOW_UNINITIALIZED
 
 	  See Documentation/nommu-mmap.txt for more information.
 
+config SYSTEM_TRUSTED_KEYRING
+	bool "Provide system-wide ring of trusted keys"
+	depends on KEYS
+	help
+	  Provide a system keyring to which trusted keys can be added.  Keys in
+	  the keyring are considered to be trusted.  Keys may be added at will
+	  by the kernel from compiled-in data and from hardware key stores, but
+	  userspace may only add extra keys if those keys can be verified by
+	  keys already in the keyring.
+
+	  Keys in this keyring are used by module signature checking.
+
 config PROFILING
 	bool "Profiling support"
 	help
@@ -1681,18 +1693,6 @@ config BASE_SMALL
 	default 0 if BASE_FULL
 	default 1 if !BASE_FULL
 
-config SYSTEM_TRUSTED_KEYRING
-	bool "Provide system-wide ring of trusted keys"
-	depends on KEYS
-	help
-	  Provide a system keyring to which trusted keys can be added.  Keys in
-	  the keyring are considered to be trusted.  Keys may be added at will
-	  by the kernel from compiled-in data and from hardware key stores, but
-	  userspace may only add extra keys if those keys can be verified by
-	  keys already in the keyring.
-
-	  Keys in this keyring are used by module signature checking.