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

1 files changed, 30 insertions, 3 deletions

diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b1eb0763b..3cfbfa369 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -195,6 +195,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_HR2 is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
@@ -559,6 +560,7 @@ CONFIG_BH1750=m
 CONFIG_BIG_KEYS=y
 CONFIG_BIG_LITTLE=y
 # CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_ELF_FDPIC is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
@@ -882,6 +884,7 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=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
@@ -987,6 +990,7 @@ CONFIG_CPUSETS=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_CRASH=m
 CONFIG_CRC16=y
@@ -1176,6 +1180,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
@@ -1311,6 +1316,9 @@ CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM_AMD_ACP=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
@@ -1358,7 +1366,7 @@ CONFIG_DRM_HDLCD=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
@@ -1924,6 +1932,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 CONFIG_GS_FPGABOOT=m
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -2130,9 +2139,9 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2431,6 +2440,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -3157,8 +3167,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
+# CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_MESON_MX_EFUSE is not set
+# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -4094,6 +4107,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=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_NVEC_PAZ00=y
@@ -4102,6 +4116,7 @@ CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM=m
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 # CONFIG_NVME_RDMA is not set
@@ -4392,6 +4407,7 @@ CONFIG_PINCTRL_AS3722=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
@@ -4401,6 +4417,10 @@ CONFIG_PINCTRL_IMX6SL=y
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
+# CONFIG_PINCTRL_MESON8B is not set
+# CONFIG_PINCTRL_MESON8 is not set
+# CONFIG_PINCTRL_MESON_GXBB is not set
+# CONFIG_PINCTRL_MESON_GXL is not set
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
@@ -4567,6 +4587,8 @@ CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_PM=y
 CONFIG_QCOM_Q6V5_PIL=m
 CONFIG_QCOM_QFPROM=m
+CONFIG_QCOM_RMTFS_MEM=m
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMP2P=m
@@ -4812,6 +4834,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5489,7 +5512,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=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_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -6108,6 +6131,7 @@ CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA_AHB=y
+# CONFIG_TEGRA_BPMP_THERMAL is not set
 CONFIG_TEGRA_BPMP=y
 CONFIG_TEGRA_GMI=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y
@@ -6126,6 +6150,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
@@ -6999,6 +7024,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
@@ -7071,6 +7097,7 @@ CONFIG_WM8350_WATCHDOG=m
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_XEN is not set
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y