From patchwork Wed Aug 18 17:41:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 62067 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 9D1B1B6F10 for ; Thu, 19 Aug 2010 03:41:41 +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 1Olmds-0000Zi-Sw; Wed, 18 Aug 2010 18:41:37 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Olmdq-0000Xn-3g for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 18:41:34 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Olmdo-0001pe-6l; Wed, 18 Aug 2010 18:41:32 +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 1Olmdn-0002SG-JA; Wed, 18 Aug 2010 18:41:32 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/9] Revert "UBUNTU: [Config] [FTBS] sparc: Temporarily disable CONFIG_INFINIBAND_QIB" Date: Wed, 18 Aug 2010 10:41:04 -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 09f58c1e8530e630a1dcf241c9e75094b6f86d3a. sparc 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 8e158b3..7bf8651 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1450,6 +1450,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y # CONFIG_INFINIBAND_NES is not set +CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_USER_MEM=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=32 diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index 3bd5fcc..d443f68 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -107,7 +107,6 @@ CONFIG_IKCONFIG=y # CONFIG_INFINIBAND_IPATH is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_ISER is not set -CONFIG_INFINIBAND_QIB=m # CONFIG_INFINIBAND_SRP is not set # CONFIG_INFINIBAND_USER_ACCESS is not set # CONFIG_INFINIBAND_USER_MAD is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index a0856f6..048f455 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -95,7 +95,6 @@ CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_IPATH is not set CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index ee219bf..62e10dd 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -108,7 +108,6 @@ CONFIG_INFINIBAND_AMSO1100=m CONFIG_INFINIBAND_IPATH=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_ISER=m -# CONFIG_INFINIBAND_QIB is not set CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m