From patchwork Mon Apr 2 14:29:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 150165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id A8DCBB6F9A for ; Tue, 3 Apr 2012 00:29:29 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEiFx-0007wh-3V; Mon, 02 Apr 2012 14:29:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEiFu-0007tc-QD for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 14:29:14 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SEiFu-0006Ia-M9 for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 14:29:14 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] Sync fs with master (AUFS, CODA, EXT2, LOGFS and NFS) Date: Mon, 2 Apr 2012 16:29:11 +0200 Message-Id: <1333376951-10504-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333376951-10504-1-git-send-email-paolo.pisati@canonical.com> References: <1333376951-10504-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com For more information and out of sync options, see here: https://wiki.ubuntu.com/KernelTeam/Specs/PreciseKernelConfigReviewBeta2omap4 Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 44bd4df..4023d09 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -252,7 +252,7 @@ CONFIG_AUFS_BR_HFSPLUS=y CONFIG_AUFS_BR_RAMFS=y # CONFIG_AUFS_DEBUG is not set # CONFIG_AUFS_EXPORT is not set -CONFIG_AUFS_FS=y +CONFIG_AUFS_FS=m # CONFIG_AUFS_HNOTIFY is not set CONFIG_AUFS_POLL=y # CONFIG_AUFS_PROC_MAP is not set @@ -402,7 +402,6 @@ CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BT=m -CONFIG_BTREE=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_BT_ATH3K=m @@ -536,7 +535,7 @@ CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootwait mem=1G" # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_CODA_FS is not set +CONFIG_CODA_FS=m CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set CONFIG_CONFIGFS_FS=m @@ -938,7 +937,7 @@ CONFIG_EXOFS_FS=m CONFIG_EXPERIMENTAL=y CONFIG_EXPERT=y CONFIG_EXPORTFS=y -CONFIG_EXT2_FS=y +CONFIG_EXT2_FS=m CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT2_FS_XATTR=y @@ -1802,12 +1801,12 @@ CONFIG_LLC2=m CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCAL_TIMERS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKDEP_SUPPORT=y CONFIG_LOCKD_V4=y # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_LOCK_STAT is not set -CONFIG_LOGFS=m +# CONFIG_LOGFS is not set CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y @@ -2301,9 +2300,9 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y -CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_FSCACHE=y CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -2722,7 +2721,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y # CONFIG_ROMFS_BACKED_BY_MTD is not set CONFIG_ROMFS_FS=m CONFIG_ROMFS_ON_BLOCK=y -CONFIG_ROOT_NFS=y CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPS=y @@ -3292,8 +3290,8 @@ CONFIG_STOP_MACHINE=y CONFIG_STP=m CONFIG_STRICT_DEVMEM=y # CONFIG_STRIP_ASM_SYMS is not set -CONFIG_SUNRPC=y -CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m CONFIG_SUN_PARTITION=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y