Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc29kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc28

1 files changed, 7 insertions, 16 deletions

diff --git a/kernel-i686.config b/kernel-i686.config
index c648b1de3..2ba4fcc23 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -696,7 +696,6 @@ CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
 CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
 # CONFIG_CAPI_TRACE is not set
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
@@ -2182,6 +2181,7 @@ CONFIG_IIO_TRIGGER=y
 # CONFIG_IKCONFIG is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE is not set
+# CONFIG_IMA_ARCH_POLICY is not set
 # CONFIG_IMA_BLACKLIST_KEYRING is not set
 CONFIG_IMA_DEFAULT_HASH_SHA1=y
 # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
@@ -2197,8 +2197,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2316,6 +2314,7 @@ CONFIG_INT3406_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY=y
 CONFIG_INTEL_ATOMISP2_PM=m
@@ -2571,12 +2570,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVERSION=m
 CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
 CONFIG_ISDN_DRV_AVMB1_B1PCI=m
@@ -3027,7 +3020,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
-# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3061,7 +3054,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -4181,6 +4173,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -4222,7 +4215,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4608,7 +4600,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5001,7 +4992,7 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5721,7 +5712,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -5861,6 +5851,7 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set
 CONFIG_TOUCHSCREEN_RM_TS=m
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
@@ -5898,7 +5889,7 @@ CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
-# CONFIG_TQMX86_WDT is not set
+CONFIG_TQMX86_WDT=m
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set