main/linux-grsec: tune config

Tune config to better match linux-vanilla config

4 files changed, 70 insertions, 63 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index c81b721281..574c65dfa1 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -169,22 +169,22 @@ md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 b4bca0946e46ae371b8456f96bb8f979  grsecurity-3.0-3.14.6-201406101411.patch
 c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
-78480c85e37624c15d2720233f6c958a  kernelconfig.x86
-0ed796d10c7f84faf528a6b4e92fb3d9  kernelconfig.x86_64
-727688e12e37262437fc9ca9c1fbd215  kernelconfig.armhf"
+83f0e1b1d2413bcb2dddcf87a10dc42b  kernelconfig.x86
+0b07cc6ece6232c631e2d55f2dd860d6  kernelconfig.x86_64
+887980f603af6a1ac6f67edeae2e0d07  kernelconfig.armhf"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
 b8de86f64a62ec1f5d62ef7b0caf302546be0d397e7c7d29e4b1e260220462d7  patch-3.14.6.xz
 abefdcbacb2c78c0de1168915dc26d16e35ec0e6158e0bbbc84fad819b234404  grsecurity-3.0-3.14.6-201406101411.patch
 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7  fix-memory-map-for-PIE-applications.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
-0ed12d0f86d8e03d4bdbc4f9321b22a7ec449ab5fca765f68f3f031dc493ffae  kernelconfig.x86
-48589462cfa1a7ea2ae71dd34c896c6d7e7c285197b78bf0519b5c8a9212a498  kernelconfig.x86_64
-00fc74f27931d161ecc1c26e5cd000d9aeaf6ebea6e0e1293ecde14a64d80467  kernelconfig.armhf"
+5431d66b9c1af413b4dc6f91de00a6e830e3d780a79c5f85d2d8b013b151c169  kernelconfig.x86
+9f420cee74896fd3578c3b342188438ac5d6b0f327586c108367abcfc3f1e6ff  kernelconfig.x86_64
+ab3e07f85f4dd090b2d22b485881031bd479a1c34fc9a2e9707cb8cdebfcfda4  kernelconfig.armhf"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
 ba8784eb4968b639704e225cbd0455768a3d381ade19d37e0cc06cc00606cc9706163b27441f32b1de4a6f71d44b14004e931ea3f9a2d86c20e35dc881e6d451  patch-3.14.6.xz
 ff19d88212682a8a2d3b244313fd54a37728de477038ebac3e118de7a61c122283f44d5bd700f440e3edd597a9f5f1dbd5bb58b57fe8631357b9ce1ceacbb681  grsecurity-3.0-3.14.6-201406101411.patch
 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7  fix-memory-map-for-PIE-applications.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
-f86584d51e0d449066f9823efc65ed24ba005226c3873ee4a97ff0885956e58157eee6b2d3984b678d0831e8786675687baa2495bdd17f58e26cccf362f1f8bc  kernelconfig.x86
-7c74515e4304c371b9f78297a3e624ca24cb116cfb06e6aa920ff2e3551123b5fbc380a3e5dc5a9a6d153287564a7a779c6925fc002ffb6bccf6f66336087309  kernelconfig.x86_64
-84cf8bf558d3fa98a46a2dc1bdd5ddbe4b36b210282d939a47123d889a47240469e7b37f1351854a396c58f4366b8267e1e7990fb91be23bc8ddd9f2a33a6257  kernelconfig.armhf"
+03f817222bf5812fa8363542e4ab108767212c67efe3994ea8fe9d0751215d9c3f166ce41de41f9070c855db6c04606828dc61265a1738920b984a24077347c4  kernelconfig.x86
+bc9e8f8a2ccb51fc2e03987657da80282354c248295f76541dba0f70b387161ad086b7a6c77647506e84064a9479f37a5a6e13a28f0aad6bbfef833bb746ee7d  kernelconfig.x86_64
+5a248ef45ad96557fd17f42d5e813d3be88e9bcbce6b0a545cd3831e466d8bfa5cba9d02ebf318d35b99274d39e0fd337050a4f8e5443447ac595db08f6ecb08  kernelconfig.armhf"
diff --git a/main/linux-grsec/kernelconfig.armhf b/main/linux-grsec/kernelconfig.armhf
index 3e11e1a429..7139a59af8 100644
--- a/main/linux-grsec/kernelconfig.armhf
+++ b/main/linux-grsec/kernelconfig.armhf
@@ -2453,7 +2453,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_DP83640_PHY is not set
+CONFIG_DP83640_PHY=m
 CONFIG_PINCTRL=y
 
 #
@@ -2575,7 +2575,7 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADT7310 is not set
+CONFIG_SENSORS_ADT7310=m
 # CONFIG_SENSORS_ADT7410 is not set
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
@@ -2907,7 +2907,7 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_IGUANA=m
-# CONFIG_IR_TTUSBIR is not set
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
@@ -4242,7 +4242,7 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
-CONFIG_UFS_FS_WRITE=y
+# CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
@@ -4290,7 +4290,7 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index db0a92a955..74463fb610 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -523,7 +523,7 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
 # CONFIG_ACPI_APEI_GHES is not set
 CONFIG_ACPI_APEI_EINJ=m
@@ -555,7 +555,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 CONFIG_X86_POWERNOW_K8=m
@@ -2127,10 +2127,10 @@ CONFIG_ATL2=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
-CONFIG_ALX=m
+# CONFIG_ALX is not set
 CONFIG_NET_CADENCE=y
-# CONFIG_ARM_AT91_ETHER is not set
-# CONFIG_MACB is not set
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2318,7 +2318,7 @@ CONFIG_PHYLIB=m
 #
 # MII PHY device drivers
 #
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_DAVICOM_PHY=m
@@ -3143,7 +3143,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
-# CONFIG_DP83640_PHY is not set
+CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -3552,14 +3552,12 @@ CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
@@ -3594,7 +3592,7 @@ CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGUANA=m
-# CONFIG_IR_TTUSBIR is not set
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
@@ -3666,9 +3664,7 @@ CONFIG_VIDEO_USBTV=m
 # CONFIG_VIDEO_HDPVR is not set
 # CONFIG_VIDEO_TLG2300 is not set
 # CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_STK1160_COMMON is not set
 
 #
 # Analog/digital TV USB devices
@@ -3810,7 +3806,7 @@ CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_VIDEO_RENESAS_VSP1 is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
@@ -3819,10 +3815,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 # Supported MMC/SDIO adapters
 #
 # CONFIG_SMS_SDIO_DRV is not set
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_PMS is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4856,7 +4849,7 @@ CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_LP5562=m
 # CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
+CONFIG_LEDS_CLEVO_MAIL=m
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PCA9685 is not set
@@ -5207,8 +5200,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 #
 # Remoteproc drivers
 #
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
+# CONFIG_STE_MODEM_RPROC is not set
 
 #
 # Rpmsg drivers
@@ -5445,7 +5437,7 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
-CONFIG_UFS_FS_WRITE=y
+# CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
@@ -5495,7 +5487,7 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -5800,7 +5792,6 @@ CONFIG_GRKERNSEC_KMEM=y
 CONFIG_GRKERNSEC_PERF_HARDEN=y
 # CONFIG_GRKERNSEC_RAND_THREADSTACK is not set
 CONFIG_GRKERNSEC_PROC_MEMMAP=y
-CONFIG_GRKERNSEC_KSTACKOVERFLOW=y
 CONFIG_GRKERNSEC_BRUTE=y
 # CONFIG_GRKERNSEC_MODHARDEN is not set
 # CONFIG_GRKERNSEC_HIDESYM is not set
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index 1efcdffe07..ea04d3153e 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -516,7 +516,7 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
 # CONFIG_ACPI_APEI_GHES is not set
 CONFIG_ACPI_APEI_EINJ=m
@@ -547,7 +547,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
@@ -2087,10 +2087,10 @@ CONFIG_ATL2=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
-CONFIG_ALX=m
+# CONFIG_ALX is not set
 CONFIG_NET_CADENCE=y
-# CONFIG_ARM_AT91_ETHER is not set
-# CONFIG_MACB is not set
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2272,7 +2272,7 @@ CONFIG_PHYLIB=m
 #
 # MII PHY device drivers
 #
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_DAVICOM_PHY=m
@@ -2587,8 +2587,8 @@ CONFIG_X25_ASY=m
 CONFIG_SBNI=m
 CONFIG_SBNI_MULTILINE=y
 CONFIG_IEEE802154_DRIVERS=m
-# CONFIG_IEEE802154_FAKEHARD is not set
-# CONFIG_IEEE802154_FAKELB is not set
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
 # CONFIG_IEEE802154_AT86RF230 is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_XEN_NETDEV_FRONTEND=y
@@ -3077,7 +3077,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
-# CONFIG_DP83640_PHY is not set
+CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -3467,7 +3467,7 @@ CONFIG_MEDIA_SUPPORT=m
 # Multimedia core support
 #
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
@@ -3518,7 +3518,7 @@ CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGUANA=m
-# CONFIG_IR_TTUSBIR is not set
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
@@ -3584,6 +3584,15 @@ CONFIG_USB_S2255=m
 CONFIG_VIDEO_USBTV=m
 
 #
+# Analog TV USB devices
+#
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_TLG2300 is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_STK1160_COMMON is not set
+
+#
 # Analog/digital TV USB devices
 #
 # CONFIG_VIDEO_AU0828 is not set
@@ -3657,7 +3666,16 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 # Media capture support
 #
-# CONFIG_VIDEO_MEYE is not set
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
 
 #
 # Media capture/analog/hybrid TV support
@@ -3714,9 +3732,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Supported MMC/SDIO adapters
 #
 # CONFIG_SMS_SDIO_DRV is not set
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -3792,11 +3808,13 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Sensors used on soc_camera driver
 #
+CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA827X=m
 CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
@@ -4684,7 +4702,7 @@ CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_LP5562=m
 # CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
+CONFIG_LEDS_CLEVO_MAIL=m
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PCA9685 is not set
@@ -4726,8 +4744,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 # CONFIG_INFINIBAND_IPATH is not set
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_QIB_DCA=y
+# CONFIG_INFINIBAND_QIB is not set
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
@@ -4745,7 +4762,7 @@ CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
+# CONFIG_INFINIBAND_ISERT is not set
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -5059,8 +5076,7 @@ CONFIG_IRQ_REMAP=y
 #
 # Remoteproc drivers
 #
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
+# CONFIG_STE_MODEM_RPROC is not set
 
 #
 # Rpmsg drivers
@@ -5298,7 +5314,7 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
-CONFIG_UFS_FS_WRITE=y
+# CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
@@ -5348,7 +5364,7 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -5841,7 +5857,7 @@ CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
-# CONFIG_CRYPTO_SHA512_SSSE3 is not set
+CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m