From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757941AbcH3JUc (ORCPT ); Tue, 30 Aug 2016 05:20:32 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:63777 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757638AbcH3JT0 (ORCPT ); Tue, 30 Aug 2016 05:19:26 -0400 X-AuditID: cbfec7f5-f792e6d0000013f5-d8-57c54f9b2e69 From: Krzysztof Kozlowski To: Olof Johansson , Arnd Bergmann , Kevin Hilman , arm@kernel.org Cc: Krzysztof Kozlowski , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski Subject: [GIT PULL 4/4] ARM: defconfig: Exynos for v4.9 Date: Tue, 30 Aug 2016 11:18:56 +0200 Message-id: <1472548739-20050-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1472548739-20050-1-git-send-email-k.kozlowski@samsung.com> References: <1472548739-20050-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNLMWRmVeSWpSXmKPExsVy+t/xy7qz/Y+GG7Tf47M49mULm8XfScfY LTbOWM9q8fqFoUX/49fMFk83P2ayOH9+A7vFpsfXWC0u75rDZjHj/D4mi1PXP7M5cHv8/jWJ 0WPTqk42j81L6j2unGhi9ejbsorR4/MmuQC2KC6blNSczLLUIn27BK6M3knpBbMFK2YfW8Pc wLiNr4uRk0NCwETi54zJTBC2mMSFe+vZuhi5OIQEljJKdB/6DeU0MkksaboOVsUmYCyxefkS NhBbRKBcYsHM04wgRcwCc5gk7rdvAEsIC5hL/H96A6yBRUBVouf+ahYQm1fAXaK5dwEzxDo5 iZPHJrOC2JwCHhLNe+6C9QoB1TTOWswygZF3ASPDKkbR1NLkguKk9FwjveLE3OLSvHS95Pzc TYyQIPy6g3HpMatDjAIcjEo8vBNcjoQLsSaWFVfmHmKU4GBWEuG19jsaLsSbklhZlVqUH19U mpNafIhRmoNFSZx35q73IUIC6YklqdmpqQWpRTBZJg5OqQbGNfVpOWLR35it3jEITIg/sk0p VPt86UOlQ2KaeXO/KDxLkrqXoTJPwYJffrl6vzLbrTLW9RHcHJPrFxp8V3qfFnrBe8ebxS96 4k0rtTZ2SWRs2jPt/x4JPU6HMNvkEtHvfRwvt5z6EsTZVthy/rUU80nX/r9fZX4s45j37mPZ EVG2OKOWKT+UWIozEg21mIuKEwFv8+R6PgIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Expected conflict in multi_v7 - take all the changes: --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -135,8 -136,7 +136,8 @@@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND= CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m + CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y Best regards, Krzysztof The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc: Linux 4.8-rc1 (2016-08-07 18:18:00 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-4.9 for you to fetch changes up to 88ea168f0a35c6aeab3c6703f7eb3b1c925c5b12: Merge tag 'tags/samsung-defconfig-schedutil-4.9' into next/defconfig (2016-08-24 06:54:32 +0200) ---------------------------------------------------------------- Samsung defconfig update for v4.9: 1. Device dynamic frequency and voltage scalling is now supported on many Exynos boards, enable it. 2. Enable PM_DEBUG, cleanup old IPV6_PRIVACY. 3. Enable SECCOMP for Systemd on Arch. 4. cpufreq schedutil cannot be module anymore. ---------------------------------------------------------------- Borislav Petkov (1): ARM: s3c2410_defconfig: Remove CONFIG_IPV6_PRIVACY Chanwoo Choi (1): ARM: exynos_defconfig: Enable bus frequency scaling with devfreq Javier Martinez Canillas (2): ARM: exynos_defconfig: Don't attempt to enable schedutil governor as module ARM: multi_v7_defconfig: Don't attempt to enable schedutil governor as module Krzysztof Kozlowski (4): ARM: exynos_defconfig: Enable PM_DEBUG ARM: exynos_defconfig: Enable SECCOMP ARM: multi_v7_defconfig: Enable SECCOMP Merge tag 'tags/samsung-defconfig-schedutil-4.9' into next/defconfig arch/arm/configs/exynos_defconfig | 11 ++++++++++- arch/arm/configs/multi_v7_defconfig | 3 ++- arch/arm/configs/s3c2410_defconfig | 1 - 3 files changed, 12 insertions(+), 3 deletions(-)