summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
commit1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb (patch)
tree16d1c0053ed21a9a32849e29702e6d5cc2b327af /config-generic
parent47bb021b79b211ec738da2bd2b9c2d98f630483b (diff)
downloadkernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.gz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.xz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.zip
Linux v4.5-3654-g5cd0911a9e0e
- Fix oops from tsc subsystem (rhbz 1318596) - crypto, security, docs, rproc, dmaengine, powersupply, hsi, vfio, driver-core, tty, char, usb, configfs, ext4, dlm, gfs2, pstore merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic10
1 files changed, 10 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 21e812975..54ded868e 100644
--- a/config-generic
+++ b/config-generic
@@ -225,6 +225,9 @@ CONFIG_FW_LOADER=y
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+
# Give this a try in rawhide for now
# CONFIG_FW_LOADER_USER_HELPER is not set
@@ -2612,10 +2615,12 @@ CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_8250_INGENIC is not set
CONFIG_SERIAL_8250_RT288X=y
CONFIG_SERIAL_8250_MID=y
+CONFIG_SERIAL_8250_MOXA=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
# CONFIG_ISI is not set
# CONFIG_RIO is not set
CONFIG_SERIAL_JSM=m
@@ -5355,6 +5360,8 @@ CONFIG_ASYNC_TX_DMA=y
# CONFIG_HSU_DMA_PCI is not set
# CONFIG_XGENE_DMA is not set
# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
CONFIG_UNUSED_SYMBOLS=y
@@ -5809,6 +5816,8 @@ CONFIG_PSTORE_RAM=m
# CONFIG_SIGMA is not set
+# CONFIG_GOLDFISH is not set
+
CONFIG_CHROME_PLATFORMS=y
CONFIG_BCMA=m
@@ -5869,6 +5878,7 @@ CONFIG_MODULE_SIG_SHA256=y
# CONFIG_MODULE_SIG_FORCE is not set
CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
CONFIG_PKCS7_MESSAGE_PARSER=y
# CONFIG_PKCS7_TEST_KEY is not set
CONFIG_SIGNED_PE_FILE_VERIFICATION=y