Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/kernel

1 files changed, 28 insertions, 3 deletions

diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f82e625f8..14611f85c 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -735,6 +735,7 @@ CONFIG_CHR_DEV_ST=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
 CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -812,6 +813,7 @@ CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_CRASH=m
 CONFIG_CRC16=y
@@ -975,6 +977,7 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
@@ -1029,6 +1032,8 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
@@ -1106,6 +1111,10 @@ CONFIG_DPTF_POWER=m
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM_AMD_ACP=y
+CONFIG_DRM_AMD_DC_DCN1_0=y
+# CONFIG_DRM_AMD_DC_FBC is not set
+# CONFIG_DRM_AMD_DC_PRE_VEGA is not set
+CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
@@ -1130,7 +1139,7 @@ CONFIG_DRM_GMA500=m
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 # CONFIG_DRM_I2C_ADV7511_CEC is not set
-CONFIG_DRM_I2C_ADV7511=m
+# CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -1668,6 +1677,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1879,7 +1889,7 @@ CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
 CONFIG_HYPERVISOR_GUEST=y
@@ -2183,11 +2193,13 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_SCU_IPC is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC_CHTWC is not set
 CONFIG_INTEL_SOC_PMIC=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
@@ -2870,6 +2882,9 @@ 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_GX_PM_DOMAINS is not set
+# CONFIG_MESON_MX_EFUSE is not set
+# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -3727,6 +3742,7 @@ CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA is not set
@@ -3947,12 +3963,15 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CEDARFORK=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_DENVERTON=m
 # CONFIG_PINCTRL_GEMINILAKE is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_MESON_GXBB is not set
+# CONFIG_PINCTRL_MESON_GXL is not set
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_SPRD is not set
@@ -4070,6 +4089,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_GLINK_SSR is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
 CONFIG_QEDI=m
@@ -4214,6 +4234,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -4838,7 +4859,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
@@ -5313,6 +5334,7 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
+# CONFIG_TEGRA_BPMP_THERMAL is not set
 CONFIG_TEHUTI=m
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_TELCLOCK=m
@@ -5320,6 +5342,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
@@ -6057,6 +6080,7 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS2805=m
 CONFIG_W1_SLAVE_DS28E04=m
+# CONFIG_W1_SLAVE_DS28E17 is not set
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W83627HF_WDT=m
@@ -6200,6 +6224,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 # CONFIG_XEN_PVCALLS_BACKEND is not set
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_PVH=y
 CONFIG_XEN_PV=y