Commit dc8fe13f authored by Ben Hutchings's avatar Ben Hutchings

Merge tag 'debian/4.12.6-1' into stretch-backports

Release linux (4.12.6-1).
parents 194bf86c 9f225007
This diff is collapsed.
...@@ -51,6 +51,7 @@ CONFIG_ARCH_HISI=y ...@@ -51,6 +51,7 @@ CONFIG_ARCH_HISI=y
CONFIG_ARCH_MESON=y CONFIG_ARCH_MESON=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_QCOM=y CONFIG_ARCH_QCOM=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_SEATTLE=y
CONFIG_ARCH_TEGRA=y CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_THUNDER=y CONFIG_ARCH_THUNDER=y
...@@ -103,6 +104,7 @@ CONFIG_IPMI_SSIF=m ...@@ -103,6 +104,7 @@ CONFIG_IPMI_SSIF=m
## ##
## file: drivers/clk/Kconfig ## file: drivers/clk/Kconfig
## ##
CONFIG_COMMON_CLK_RK808=y
CONFIG_COMMON_CLK_XGENE=y CONFIG_COMMON_CLK_XGENE=y
## ##
...@@ -156,7 +158,6 @@ CONFIG_QCOM_HIDMA=m ...@@ -156,7 +158,6 @@ CONFIG_QCOM_HIDMA=m
## file: drivers/edac/Kconfig ## file: drivers/edac/Kconfig
## ##
CONFIG_EDAC=y CONFIG_EDAC=y
CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC_XGENE=m CONFIG_EDAC_XGENE=m
## ##
...@@ -268,6 +269,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m ...@@ -268,6 +269,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
CONFIG_I2C_MESON=m CONFIG_I2C_MESON=m
CONFIG_I2C_MV64XXX=m CONFIG_I2C_MV64XXX=m
CONFIG_I2C_QUP=m CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=m
CONFIG_I2C_TEGRA=m CONFIG_I2C_TEGRA=m
CONFIG_I2C_THUNDERX=m CONFIG_I2C_THUNDERX=m
CONFIG_I2C_CROS_EC_TUNNEL=m CONFIG_I2C_CROS_EC_TUNNEL=m
...@@ -323,6 +325,7 @@ CONFIG_MFD_HI655X_PMIC=m ...@@ -323,6 +325,7 @@ CONFIG_MFD_HI655X_PMIC=m
CONFIG_MFD_MAX77620=y CONFIG_MFD_MAX77620=y
CONFIG_MFD_QCOM_RPM=m CONFIG_MFD_QCOM_RPM=m
CONFIG_MFD_SPMI_PMIC=m CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_RK808=m
## ##
## file: drivers/misc/Kconfig ## file: drivers/misc/Kconfig
...@@ -345,6 +348,7 @@ CONFIG_MMC=y ...@@ -345,6 +348,7 @@ CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=m CONFIG_MMC_ARMMMCI=m
CONFIG_MMC_QCOM_DML=m CONFIG_MMC_QCOM_DML=m
CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
CONFIG_MMC_SDHCI_TEGRA=m CONFIG_MMC_SDHCI_TEGRA=m
CONFIG_MMC_SDHCI_IPROC=m CONFIG_MMC_SDHCI_IPROC=m
CONFIG_MMC_MESON_GX=m CONFIG_MMC_MESON_GX=m
...@@ -352,7 +356,9 @@ CONFIG_MMC_SDHCI_MSM=m ...@@ -352,7 +356,9 @@ CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SPI=m CONFIG_MMC_SPI=m
CONFIG_MMC_DW=m CONFIG_MMC_DW=m
CONFIG_MMC_DW_K3=m CONFIG_MMC_DW_K3=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC_SUNXI=m CONFIG_MMC_SUNXI=m
CONFIG_MMC_SDHCI_XENON=m
## ##
## file: drivers/mtd/spi-nor/Kconfig ## file: drivers/mtd/spi-nor/Kconfig
...@@ -437,6 +443,11 @@ CONFIG_HNS_ENET=m ...@@ -437,6 +443,11 @@ CONFIG_HNS_ENET=m
CONFIG_NET_VENDOR_INTEL=y CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m CONFIG_E100=m
##
## file: drivers/net/ethernet/marvell/Kconfig
##
CONFIG_MVNETA=m
## ##
## file: drivers/net/ethernet/natsemi/Kconfig ## file: drivers/net/ethernet/natsemi/Kconfig
## ##
...@@ -465,6 +476,7 @@ CONFIG_STMMAC_PLATFORM=m ...@@ -465,6 +476,7 @@ CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_IPQ806X=m
CONFIG_DWMAC_MESON=m CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
## ##
## file: drivers/net/fddi/Kconfig ## file: drivers/net/fddi/Kconfig
...@@ -535,6 +547,7 @@ CONFIG_PCI_HOST_GENERIC=y ...@@ -535,6 +547,7 @@ CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_XGENE=y CONFIG_PCI_XGENE=y
CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_ECAM=y
CONFIG_PCIE_ROCKCHIP=y
## ##
## file: drivers/phy/Kconfig ## file: drivers/phy/Kconfig
...@@ -543,6 +556,9 @@ CONFIG_PHY_HI6220_USB=m ...@@ -543,6 +556,9 @@ CONFIG_PHY_HI6220_USB=m
CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_QCOM_IPQ806X_SATA=m CONFIG_PHY_QCOM_IPQ806X_SATA=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_PCIE=m
CONFIG_PHY_XGENE=m CONFIG_PHY_XGENE=m
CONFIG_PHY_QCOM_UFS=m CONFIG_PHY_QCOM_UFS=m
CONFIG_PHY_MESON8B_USB2=m CONFIG_PHY_MESON8B_USB2=m
...@@ -595,6 +611,7 @@ CONFIG_CHARGER_QCOM_SMBB=m ...@@ -595,6 +611,7 @@ CONFIG_CHARGER_QCOM_SMBB=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_PWM_BCM2835=m CONFIG_PWM_BCM2835=m
CONFIG_PWM_MESON=m CONFIG_PWM_MESON=m
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_TEGRA=m CONFIG_PWM_TEGRA=m
## ##
...@@ -609,6 +626,7 @@ CONFIG_REGULATOR_PWM=m ...@@ -609,6 +626,7 @@ CONFIG_REGULATOR_PWM=m
CONFIG_REGULATOR_QCOM_RPM=m CONFIG_REGULATOR_QCOM_RPM=m
CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m
CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_SPMI=m
CONFIG_REGULATOR_RK808=m
## ##
## file: drivers/remoteproc/Kconfig ## file: drivers/remoteproc/Kconfig
...@@ -633,6 +651,7 @@ CONFIG_COMMON_RESET_HI6220=m ...@@ -633,6 +651,7 @@ CONFIG_COMMON_RESET_HI6220=m
## ##
CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_MAX77686=y
CONFIG_RTC_DRV_RK808=y
CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUN6I=y
...@@ -660,12 +679,16 @@ CONFIG_RASPBERRYPI_POWER=y ...@@ -660,12 +679,16 @@ CONFIG_RASPBERRYPI_POWER=y
## ##
CONFIG_QCOM_GSBI=m CONFIG_QCOM_GSBI=m
CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMEM=m
CONFIG_QCOM_SMD=m
CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMD_RPM=m
CONFIG_QCOM_SMP2P=m CONFIG_QCOM_SMP2P=m
CONFIG_QCOM_SMSM=m CONFIG_QCOM_SMSM=m
CONFIG_QCOM_WCNSS_CTRL=m CONFIG_QCOM_WCNSS_CTRL=m
##
## file: drivers/soc/rockchip/Kconfig
##
CONFIG_ROCKCHIP_PM_DOMAINS=y
## ##
## file: drivers/soc/tegra/Kconfig ## file: drivers/soc/tegra/Kconfig
## ##
...@@ -798,10 +821,16 @@ CONFIG_USB_QCOM_8X16_PHY=m ...@@ -798,10 +821,16 @@ CONFIG_USB_QCOM_8X16_PHY=m
CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_LP855X=m CONFIG_BACKLIGHT_LP855X=m
##
## file: drivers/video/console/Kconfig
##
CONFIG_FRAMEBUFFER_CONSOLE=y
## ##
## file: drivers/video/fbdev/Kconfig ## file: drivers/video/fbdev/Kconfig
## ##
CONFIG_FB_EFI=y CONFIG_FB_EFI=y
CONFIG_FB_SIMPLE=y
## ##
## file: drivers/virtio/Kconfig ## file: drivers/virtio/Kconfig
...@@ -830,6 +859,7 @@ CONFIG_BT_LEDS=y ...@@ -830,6 +859,7 @@ CONFIG_BT_LEDS=y
## ##
## file: sound/pci/hda/Kconfig ## file: sound/pci/hda/Kconfig
## ##
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_TEGRA=m CONFIG_SND_HDA_TEGRA=m
## ##
......
...@@ -363,8 +363,8 @@ CONFIG_NFTL=m ...@@ -363,8 +363,8 @@ CONFIG_NFTL=m
## ##
## file: drivers/mtd/chips/Kconfig ## file: drivers/mtd/chips/Kconfig
## ##
CONFIG_MTD_CFI=y CONFIG_MTD_CFI=m
CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_JEDECPROBE=m
CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_ADV_OPTIONS=y
## choice: Flash cmd/query data swapping ## choice: Flash cmd/query data swapping
CONFIG_MTD_CFI_NOSWAP=y CONFIG_MTD_CFI_NOSWAP=y
...@@ -384,9 +384,9 @@ CONFIG_MTD_CFI_I4=y ...@@ -384,9 +384,9 @@ CONFIG_MTD_CFI_I4=y
# CONFIG_MTD_CFI_I8 is not set # CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_OTP is not set # CONFIG_MTD_OTP is not set
#. Needed e.g. on QNAP devices #. Needed e.g. on QNAP devices
CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_INTELEXT=m
#. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc #. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc
CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_AMDSTD=m
CONFIG_MTD_CFI_STAA=m CONFIG_MTD_CFI_STAA=m
# CONFIG_MTD_RAM is not set # CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set # CONFIG_MTD_ROM is not set
...@@ -413,10 +413,10 @@ CONFIG_MTD_PHYSMAP_OF=y ...@@ -413,10 +413,10 @@ CONFIG_MTD_PHYSMAP_OF=y
## ##
## file: drivers/mtd/nand/Kconfig ## file: drivers/mtd/nand/Kconfig
## ##
CONFIG_MTD_NAND=y CONFIG_MTD_NAND=m
# CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_CAFE is not set # CONFIG_MTD_NAND_CAFE is not set
CONFIG_MTD_NAND_ORION=y CONFIG_MTD_NAND_ORION=m
## ##
## file: drivers/mtd/onenand/Kconfig ## file: drivers/mtd/onenand/Kconfig
......
...@@ -158,6 +158,11 @@ CONFIG_PATA_IMX=m ...@@ -158,6 +158,11 @@ CONFIG_PATA_IMX=m
CONFIG_PATA_PLATFORM=m CONFIG_PATA_PLATFORM=m
CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OF_PLATFORM=m
##
## file: drivers/auxdisplay/Kconfig
##
CONFIG_ARM_CHARLCD=y
## ##
## file: drivers/base/Kconfig ## file: drivers/base/Kconfig
## ##
...@@ -327,9 +332,9 @@ CONFIG_DRM_PANEL_SIMPLE=m ...@@ -327,9 +332,9 @@ CONFIG_DRM_PANEL_SIMPLE=m
## file: drivers/gpu/drm/rockchip/Kconfig ## file: drivers/gpu/drm/rockchip/Kconfig
## ##
CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_ROCKCHIP=m
CONFIG_ROCKCHIP_ANALOGIX_DP=m CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_DW_HDMI=m CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=m CONFIG_ROCKCHIP_DW_MIPI_DSI=y
## ##
## file: drivers/gpu/drm/tegra/Kconfig ## file: drivers/gpu/drm/tegra/Kconfig
...@@ -382,7 +387,6 @@ CONFIG_OMAP_SSI=m ...@@ -382,7 +387,6 @@ CONFIG_OMAP_SSI=m
CONFIG_SENSORS_G762=m CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_GPIO_FAN=m
CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_TWL4030_MADC=m
## ##
## file: drivers/hwspinlock/Kconfig ## file: drivers/hwspinlock/Kconfig
...@@ -584,11 +588,6 @@ CONFIG_MFD_PALMAS=y ...@@ -584,11 +588,6 @@ CONFIG_MFD_PALMAS=y
CONFIG_TWL4030_CORE=y CONFIG_TWL4030_CORE=y
CONFIG_TWL6040_CORE=y CONFIG_TWL6040_CORE=y
##
## file: drivers/misc/Kconfig
##
CONFIG_ARM_CHARLCD=y
## ##
## file: drivers/misc/ti-st/Kconfig ## file: drivers/misc/ti-st/Kconfig
## ##
...@@ -909,13 +908,13 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y ...@@ -909,13 +908,13 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
## ##
CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_BQ27XXX=m
CONFIG_AXP20X_POWER=m
CONFIG_BATTERY_TWL4030_MADC=m CONFIG_BATTERY_TWL4030_MADC=m
CONFIG_BATTERY_RX51=m CONFIG_BATTERY_RX51=m
CONFIG_CHARGER_ISP1704=m CONFIG_CHARGER_ISP1704=m
CONFIG_CHARGER_TWL4030=m CONFIG_CHARGER_TWL4030=m
CONFIG_CHARGER_GPIO=m CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_BQ2415X=m CONFIG_CHARGER_BQ2415X=m
CONFIG_AXP20X_POWER=m
## ##
## file: drivers/pwm/Kconfig ## file: drivers/pwm/Kconfig
......
...@@ -36,6 +36,10 @@ CONFIG_CFQ_GROUP_IOSCHED=y ...@@ -36,6 +36,10 @@ CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_NOOP is not set
## end choice ## end choice
CONFIG_MQ_IOSCHED_DEADLINE=y
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_BFQ_GROUP_IOSCHED=y
## ##
## file: block/partitions/Kconfig ## file: block/partitions/Kconfig
...@@ -75,6 +79,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/benh@debian.org.cert.pem" ...@@ -75,6 +79,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/benh@debian.org.cert.pem"
CONFIG_CRYPTO=y CONFIG_CRYPTO=y
CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_NULL=m
...@@ -145,6 +150,7 @@ CONFIG_CRYPTO_DRBG_MENU=m ...@@ -145,6 +150,7 @@ CONFIG_CRYPTO_DRBG_MENU=m
CONFIG_CRYPTO_JITTERENTROPY=m CONFIG_CRYPTO_JITTERENTROPY=m
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
## ##
...@@ -173,7 +179,6 @@ CONFIG_ACPI_TABLE_UPGRADE=y ...@@ -173,7 +179,6 @@ CONFIG_ACPI_TABLE_UPGRADE=y
## file: drivers/acpi/nfit/Kconfig ## file: drivers/acpi/nfit/Kconfig
## ##
CONFIG_ACPI_NFIT=m CONFIG_ACPI_NFIT=m
# CONFIG_ACPI_NFIT_DEBUG is not set
## ##
## file: drivers/android/Kconfig ## file: drivers/android/Kconfig
...@@ -279,6 +284,7 @@ CONFIG_ATM_SOLOS=m ...@@ -279,6 +284,7 @@ CONFIG_ATM_SOLOS=m
## file: drivers/auxdisplay/Kconfig ## file: drivers/auxdisplay/Kconfig
## ##
# CONFIG_AUXDISPLAY is not set # CONFIG_AUXDISPLAY is not set
# CONFIG_PANEL is not set
## ##
## file: drivers/base/Kconfig ## file: drivers/base/Kconfig
...@@ -320,7 +326,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 ...@@ -320,7 +326,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_CRYPTOLOOP is not set
CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_SIZE=16384
...@@ -329,7 +334,6 @@ CONFIG_ATA_OVER_ETH=m ...@@ -329,7 +334,6 @@ CONFIG_ATA_OVER_ETH=m
CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set # CONFIG_BLK_DEV_RSXX is not set
...@@ -1692,7 +1696,6 @@ CONFIG_LEDS_REGULATOR=m ...@@ -1692,7 +1696,6 @@ CONFIG_LEDS_REGULATOR=m
CONFIG_LEDS_BD2802=m CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m CONFIG_LEDS_MC13783=m
# CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_TLC591XX is not set
...@@ -1749,7 +1752,6 @@ CONFIG_DM_SNAPSHOT=m ...@@ -1749,7 +1752,6 @@ CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_SMQ=m CONFIG_DM_CACHE_SMQ=m
CONFIG_DM_CACHE_CLEANER=y
CONFIG_DM_ERA=m CONFIG_DM_ERA=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_LOG_USERSPACE=m
...@@ -1782,6 +1784,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y ...@@ -1782,6 +1784,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_SDR_SUPPORT=y