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

1 files changed, 43 insertions, 3 deletions

diff --git a/kernel-i686.config b/kernel-i686.config
index 1c6cdc142..cda672702 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -106,6 +106,7 @@ CONFIG_AD5272=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD5933 is not set
+CONFIG_AD7124=m
 # CONFIG_AD7150 is not set
 # CONFIG_AD7152 is not set
 # CONFIG_AD7192 is not set
@@ -124,6 +125,7 @@ CONFIG_AD7766=m
 # CONFIG_AD7816 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
+CONFIG_AD7949=m
 # CONFIG_AD799X is not set
 # CONFIG_AD8366 is not set
 # CONFIG_AD8801 is not set
@@ -542,6 +544,7 @@ CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_BPF_LIRC_MODE2=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -1057,6 +1060,7 @@ CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1449,6 +1453,7 @@ CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_VARS_PSTORE is not set
 CONFIG_EFI=y
 # CONFIG_EFS_FS is not set
+# CONFIG_EISA is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENA_ETHERNET=m
@@ -1739,6 +1744,7 @@ CONFIG_GPD_POCKET_FAN=m
 CONFIG_GPIO_AMDPT=m
 CONFIG_GPIO_BD9571MWV=m
 # CONFIG_GPIO_BT8XX is not set
+CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 CONFIG_GPIO_CS5535=y
 # CONFIG_GPIO_DWAPB is not set
@@ -1770,6 +1776,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
+CONFIG_GPIO_SAMA5D2_PIOBU=m
 # CONFIG_GPIO_SCH311X is not set
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SODAVILLE is not set
@@ -2346,6 +2353,7 @@ CONFIG_INTEL_SOC_PMIC_BXTWC=y
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC_CHTWC is not set
 CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_STRATIX10_SERVICE=m
 CONFIG_INTEL_TELEMETRY=m
 # CONFIG_INTEL_TH is not set
 # CONFIG_INTEL_TXT is not set
@@ -2981,6 +2989,7 @@ CONFIG_MAX_RAW_DEVS=8192
 # CONFIG_MCP3422 is not set
 CONFIG_MCP3911=m
 CONFIG_MCP4018=m
+CONFIG_MCP41010=m
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
@@ -3167,6 +3176,7 @@ CONFIG_MIGRATION=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
+CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
@@ -3224,6 +3234,7 @@ CONFIG_MMA7660=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
+CONFIG_MMC_ALCOR=m
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
@@ -3236,6 +3247,7 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_AM654=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
@@ -3606,7 +3618,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NETROM=m
 # CONFIG_NET_SB1000 is not set
 CONFIG_NET_SCH_ATM=m
-# CONFIG_NET_SCH_CAKE is not set
+CONFIG_NET_SCH_CAKE=m
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_CHOKE=m
@@ -3615,7 +3627,7 @@ CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_GRED=m
@@ -3779,6 +3791,7 @@ CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_FLOW_TABLE=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3953,6 +3966,8 @@ CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET=m
 CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_TCP=m
+CONFIG_NVME_TCP=m
 # CONFIG_NVM is not set
 CONFIG_NVRAM=y
 CONFIG_NV_TCO=m
@@ -4156,7 +4171,9 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONET is not set
 CONFIG_PHY_CADENCE_DP=m
+CONFIG_PHY_CADENCE_SIERRA=m
 # CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
@@ -4380,13 +4397,26 @@ CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_CPS_XX=m
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
 # CONFIG_RAPIDIO is not set
+CONFIG_RAPIDIO_MPORT_CDEV=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_TSI721=m
 CONFIG_RAS_CEC=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
-CONFIG_RC_CORE=m
+CONFIG_RC_CORE=y
 CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
 CONFIG_RC_LOOPBACK=m
@@ -4481,6 +4511,9 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+CONFIG_RIONET=m
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_RIONET_TX_SIZE=128
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F11=y
@@ -4789,6 +4822,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFSHCD=m
@@ -4961,12 +4995,15 @@ 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_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_SHT15=m
@@ -5747,6 +5784,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
 CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
@@ -6145,6 +6183,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
@@ -6277,6 +6316,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 CONFIG_VBOXGUEST=m
 # CONFIG_VCNL4000 is not set
+CONFIG_VCNL4035=m
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
 # CONFIG_VF610_ADC is not set