summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2019-02-07 11:06:00 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-10 07:09:01 +0100
commit66da661f94ebb943b54bb07e788a7371116d0a86 (patch)
tree4544ddf6f125f2bc1b433cb83c0618811b94f9d4
parent44c81a48231012e510267b9fe26403325465a19a (diff)
downloadtalos-obmc-linux-66da661f94ebb943b54bb07e788a7371116d0a86.tar.gz
talos-obmc-linux-66da661f94ebb943b54bb07e788a7371116d0a86.zip
Revert "selftests: firmware: add CONFIG_FW_LOADER_USER_HELPER_FALLBACK to config"
commit d2b284d356e9758d2bafd505d482e3c9433ef424 upstream. This reverts commit 7492902e8d22b568463897fa967c0886764cf034. The commit tried to address an issue discovered by Dan where he got a message saying: 'usermode helper disabled so ignoring test'. Dans's commit is forcing CONFIG_FW_LOADER_USER_HELPER_FALLBACK but just having CONFIG_FW_LOADER_USER_HELPER suffices to emulate the_FALLBACK functionality. Dan's commit is trying to fix an issue which is hidden from a previous commit. That issue will be addressed properly next. Fixes: 7492902e8d22 ("selftests: firmware: add CONFIG_FW_LOADER_USER_HELPER_FALLBACK to config") Cc: stable <stable@vger.kernel.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/testing/selftests/firmware/config1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/testing/selftests/firmware/config b/tools/testing/selftests/firmware/config
index 913a25a4a32b..bf634dda0720 100644
--- a/tools/testing/selftests/firmware/config
+++ b/tools/testing/selftests/firmware/config
@@ -1,6 +1,5 @@
CONFIG_TEST_FIRMWARE=y
CONFIG_FW_LOADER=y
CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
OpenPOWER on IntegriCloud