Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24

1 files changed, 32 insertions, 2 deletions

diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index a2c11e358..4f4af47b3 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -350,6 +350,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1051,6 +1052,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1094,8 +1096,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1116,7 +1120,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1125,18 +1131,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1861,6 +1871,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2030,6 +2041,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2847,6 +2859,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4029,6 +4042,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4688,7 +4703,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4704,7 +4719,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4738,6 +4755,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4790,6 +4808,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4804,6 +4824,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4817,7 +4838,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4840,6 +4863,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4856,10 +4881,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5049,6 +5076,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5248,6 +5276,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6020,3 +6049,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set