From patchwork Wed Aug 18 17:41:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 62063 X-Patchwork-Delegate: leann.ogasawara@canonical.com 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 9EB07B70D3 for ; Thu, 19 Aug 2010 03:41:30 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Olmdd-0000Oq-7l; Wed, 18 Aug 2010 18:41:21 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Olmdb-0000OU-PU for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 18:41:19 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OlmdY-0001WQ-T2; Wed, 18 Aug 2010 18:41:17 +0100 Received: from host-208-74-128-122.dutchbros-02.cust.visp.net ([208.74.128.122] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OlmdY-0002Rx-8w; Wed, 18 Aug 2010 18:41:16 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/9] Revert "UBUNTU: [Config] [FTBS] ia64: Temporarily disable CONFIG_CEPH_FS" Date: Wed, 18 Aug 2010 10:41:00 -0700 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Cc: luke.yelavich@canonical.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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 This reverts commit 2f34836212b3b3868922e62ff07d867c4aed77a6. ia64 is being decommissioned so drop this patch. Signed-off-by: Leann Ogasawara --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 775f80c..3be1fc9 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -476,6 +476,7 @@ CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_CEPH_FS=m # CONFIG_CEPH_FS_PRETTYDEBUG is not set CONFIG_CFG80211=m CONFIG_CFG80211_DEBUGFS=y diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index a25b5ac..fffffa2 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -21,7 +21,6 @@ CONFIG_BLK_DEV_LOOP=m # CONFIG_BRIDGE_NF_EBTABLES is not set CONFIG_BSD_DISKLABEL=y CONFIG_BT=m -# CONFIG_CEPH_FS is not set # CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CHR_DEV_SCH=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1cde1cb..87cb54c 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -20,7 +20,6 @@ CONFIG_BONDING=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BSD_DISKLABEL=y CONFIG_BT=m -CONFIG_CEPH_FS=m CONFIG_CGROUP_DEVICE=y CONFIG_CHR_DEV_SCH=m CONFIG_CPU_FREQ=y diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 19e0a16..20fd36e 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -22,7 +22,6 @@ CONFIG_BONDING=m CONFIG_BRIDGE_NF_EBTABLES=m # CONFIG_BSD_DISKLABEL is not set # CONFIG_BT is not set -CONFIG_CEPH_FS=m # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CGROUP_DEVICE=y # CONFIG_CHR_DEV_SCH is not set