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, 10 insertions, 15 deletions

diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b1850b42c..a55a95e0e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -852,7 +852,6 @@ CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
 CONFIG_CAPI_AVM=y
-# CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
@@ -2488,7 +2487,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
 # CONFIG_IMX_IRQSTEER is not set
@@ -2627,6 +2626,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=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_IDMA64 is not set
@@ -2847,12 +2847,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
@@ -3333,7 +3327,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
@@ -4714,7 +4708,7 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -5225,7 +5219,7 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_IMXDI=m
-# CONFIG_RTC_DRV_IMX_SC is not set
+CONFIG_RTC_DRV_IMX_SC=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5636,7 +5630,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
@@ -6275,7 +6269,7 @@ CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX7D=y
-# CONFIG_SOC_IMX7ULP is not set
+CONFIG_SOC_IMX7ULP=y
 # CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAP5=y
@@ -6533,7 +6527,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m
@@ -6700,6 +6694,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
@@ -7394,7 +7389,7 @@ CONFIG_VIDEO_STI_HDMI_CEC=m
 CONFIG_VIDEO_STI_HVA=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUN6I_CSI is not set
+CONFIG_VIDEO_SUN6I_CSI=m
 CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m