[5/9] config: android-base: add CONFIG_IKCONFIG option

Message ID	1496915712-14176-6-git-send-email-amit.pundir@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Amit Pundir <amit.pundir@linaro.org> To: Andrew Morton <akpm@linux-foundation.org>, Rob Herring <robh@kernel.org>, Greg KH <gregkh@linuxfoundation.org> Cc: lkml <linux-kernel@vger.kernel.org>, Android Kernel Team <kernel-team@android.com>, Greg Kroah-Hartman <gregkh@google.com> Subject: [PATCH 5/9] config: android-base: add CONFIG_IKCONFIG option Date: Thu, 8 Jun 2017 15:25:08 +0530 Message-Id: <1496915712-14176-6-git-send-email-amit.pundir@linaro.org> In-Reply-To: <1496915712-14176-1-git-send-email-amit.pundir@linaro.org> References: <1496915712-14176-1-git-send-email-amit.pundir@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	kernel/configs: Android config fragment updates \| expand [0/9] kernel/configs: Android config fragment updates [1/9] config: android-recommended: enable fstack-protector-strong [2/9] config: android-recommended: enable CONFIG_ARM64_SW_TTBR0_PAN [3/9] config: android-base: disable CONFIG_USELIB and CONFIG_FHANDLE [4/9] config: android-recommended: enable CONFIG_CPU_SW_DOMAIN_PAN [5/9] config: android-base: add CONFIG_IKCONFIG option [6/9] config: android-base: add CONFIG_MODULES option [7/9] config: android-base: enable CONFIG_INET_DIAG_DESTROY [8/9] config: android-base: add CGROUP_BPF [9/9] config: android-base: disable CONFIG_NFSD and CONFIG_NFS_FS

Message ID

1496915712-14176-6-git-send-email-amit.pundir@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Amit Pundir <amit.pundir@linaro.org>
To: Andrew Morton <akpm@linux-foundation.org>, Rob Herring <robh@kernel.org>,
	Greg KH <gregkh@linuxfoundation.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Android Kernel Team <kernel-team@android.com>,
	Greg Kroah-Hartman <gregkh@google.com>
Subject: [PATCH 5/9] config: android-base: add CONFIG_IKCONFIG option
Date: Thu,  8 Jun 2017 15:25:08 +0530
Message-Id: <1496915712-14176-6-git-send-email-amit.pundir@linaro.org>
In-Reply-To: <1496915712-14176-1-git-send-email-amit.pundir@linaro.org>
References: <1496915712-14176-1-git-send-email-amit.pundir@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

kernel/configs: Android config fragment updates | expand

Commit Message

Amit Pundir June 8, 2017, 9:55 a.m. UTC

From: Greg Kroah-Hartman <gregkh@google.com>


This adds CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC options, which are a
requirement for the O release.

Reviewed-at: https://android-review.googlesource.com/#/c/364553/

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

[AmitP: cherry-picked this change from Android common kernel]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

---
 kernel/configs/android-base.config | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.7.4

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index efe5ff86767e..e12cfec25758 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -25,6 +25,8 @@  CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y

[5/9] config: android-base: add CONFIG_IKCONFIG option

Commit Message

Patch