From patchwork Fri Jun 27 23:22:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 365222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 6841A1400B5; Sat, 28 Jun 2014 09:23:14 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X0fU7-0000Fw-KN; Fri, 27 Jun 2014 23:23:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X0fTx-0000Du-7J for kernel-team@lists.ubuntu.com; Fri, 27 Jun 2014 23:23:01 +0000 Received: from 23-123-229-184.lightspeed.rcsntx.sbcglobal.net ([23.123.229.184] helo=boyd.l.tihix.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1X0fTw-0008Jn-Rf; Fri, 27 Jun 2014 23:23:01 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/6] UBUNTU: [Config] CONFIG_ECRYPT_FS=y Date: Fri, 27 Jun 2014 18:22:44 -0500 Message-Id: <1403911369-32675-2-git-send-email-tyhicks@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403911369-32675-1-git-send-email-tyhicks@canonical.com> References: <1403911369-32675-1-git-send-email-tyhicks@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Build eCryptfs into the kernel, rather than a loadable module, to be in line with all other Ubuntu kernels. Signed-off-by: Tyler Hicks --- debian.mako/config/config.common.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.mako/config/config.common.ubuntu b/debian.mako/config/config.common.ubuntu index f42ee46..c875aa6 100644 --- a/debian.mako/config/config.common.ubuntu +++ b/debian.mako/config/config.common.ubuntu @@ -567,7 +567,7 @@ CONFIG_EARJACK_DEBUGGER=y CONFIG_EARLYSUSPEND=y # CONFIG_ECHO is not set # CONFIG_ECONET is not set -CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS=y # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set # CONFIG_EEPROM_AT24 is not set