From patchwork Fri Jun 27 23:19:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 365214 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 114AB1400B5; Sat, 28 Jun 2014 09:20:27 +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 1X0fRQ-0007yw-7s; Fri, 27 Jun 2014 23:20:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X0fRK-0007wD-DT for kernel-team@lists.ubuntu.com; Fri, 27 Jun 2014 23:20:18 +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 1X0fRK-0008GA-0U; Fri, 27 Jun 2014 23:20:18 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/8] UBUNTU: [Config] CONFIG_ECRYPT_FS=y Date: Fri, 27 Jun 2014 18:19:41 -0500 Message-Id: <1403911188-32182-2-git-send-email-tyhicks@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403911188-32182-1-git-send-email-tyhicks@canonical.com> References: <1403911188-32182-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 eCryptfs was not enabled in the i386 goldfish kernel. Signed-off-by: Tyler Hicks --- debian.goldfish/config/armhf/config.common.armhf | 1 - debian.goldfish/config/config.common.ubuntu | 1 + debian.goldfish/config/i386/config.common.i386 | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.goldfish/config/armhf/config.common.armhf b/debian.goldfish/config/armhf/config.common.armhf index a8a069fd..5c00a19 100644 --- a/debian.goldfish/config/armhf/config.common.armhf +++ b/debian.goldfish/config/armhf/config.common.armhf @@ -48,7 +48,6 @@ CONFIG_DM_ZERO=m CONFIG_DRM=m CONFIG_DRM_KMS_HELPER=m CONFIG_DS1682=m -CONFIG_ECRYPT_FS=y # CONFIG_EEPROM_93CX6 is not set CONFIG_EEPROM_AT24=m CONFIG_EEPROM_LEGACY=m diff --git a/debian.goldfish/config/config.common.ubuntu b/debian.goldfish/config/config.common.ubuntu index 2bd6603..a66ed12 100644 --- a/debian.goldfish/config/config.common.ubuntu +++ b/debian.goldfish/config/config.common.ubuntu @@ -793,6 +793,7 @@ CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_ECHO is not set # CONFIG_ECONET is not set +CONFIG_ECRYPT_FS=y CONFIG_EDAC=y # CONFIG_EDAC_DEBUG is not set # CONFIG_EDAC_MM_EDAC is not set diff --git a/debian.goldfish/config/i386/config.common.i386 b/debian.goldfish/config/i386/config.common.i386 index 714321a..e6a059a 100644 --- a/debian.goldfish/config/i386/config.common.i386 +++ b/debian.goldfish/config/i386/config.common.i386 @@ -48,7 +48,6 @@ CONFIG_DM_ZERO=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y # CONFIG_DS1682 is not set -# CONFIG_ECRYPT_FS is not set CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_LEGACY is not set