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

1 files changed, 24 insertions, 0 deletions

diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 99e12e29f..bae4071a9 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -316,6 +316,7 @@ CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
 CONFIG_ARMADA_37XX_WATCHDOG=m
 CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_THERMAL=m
@@ -360,6 +361,7 @@ CONFIG_ARM_SCPI_CPUFREQ=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3_PMU=m
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SMMU=y
@@ -1060,11 +1062,13 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_I2C=m
 # CONFIG_CROS_EC_LIGHTBAR is not set
 CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_VBC=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEGIS128L=m
@@ -1780,6 +1784,7 @@ CONFIG_FB_MXS=m
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM3 is not set
+# CONFIG_FB_PRE_INIT_FB is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1980,6 +1985,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_MAX77620=y
 CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
+CONFIG_GPIO_MLXBF=m
 # CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
@@ -2435,6 +2441,7 @@ CONFIG_IMX_GPCV2=y
 CONFIG_IMX_MBOX=m
 CONFIG_IMX_SCU_PD=y
 CONFIG_IMX_SCU=y
+CONFIG_IMX_SC_WDT=m
 CONFIG_IMX_SDMA=m
 # CONFIG_IMX_THERMAL is not set 
 # CONFIG_IMX_WEIM is not set
@@ -3419,6 +3426,7 @@ CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX90614=m
 CONFIG_MLX90632=m
+CONFIG_MLXBF_TMFIFO=m
 CONFIG_MLXFW=m
 CONFIG_MLXREG_HOTPLUG=m
 CONFIG_MLXREG_IO=m
@@ -3593,14 +3601,28 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MCHP23K256 is not set
 # CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_NAND_BRCMNAND is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND is not set
 CONFIG_MTD_NAND_MARVELL=m
 # CONFIG_MTD_NAND_MESON is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_QCOM is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_SUNXI is not set
 CONFIG_MTD_NAND_TEGRA=m
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_ONENAND is not set
@@ -3613,6 +3635,7 @@ CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
+CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SHARPSL_PARTS is not set
@@ -4658,6 +4681,7 @@ CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_HIBVT=m
 # CONFIG_PWM_IMX1 is not set
 CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=m