From: Olof Johansson Date: Mon, 19 Jun 2017 06:09:48 +0000 (-0700) Subject: Merge tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Tag: v4.13~425^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=125370a9288fcc5ca09d64942fed44f73277c6c3;p=mirror_ubuntu-artful-kernel.git Merge tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig The i.MX defconfig updates for 4.13: - Enable i.MX7 ADC driver support. - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set trip points for testing. - CONFIG_DEBUG_FS gets lost by accident because of a change around CONFIG_RCU_TRACE. Re-enable it explicitly. - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig. - Enable more common cpufreq governors to help test cpufreq driver. * tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS ARM: mxs_defconfig: Re-enable MXS LRADC ARM: mxs_defconfig: Enable CONFIG_CGROUPS ARM: imx_v6_v7_defconfig: Enable cpufreq governors Signed-off-by: Olof Johansson --- 125370a9288fcc5ca09d64942fed44f73277c6c3