From patchwork Mon Mar 4 15:35:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 224744 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 DAC122C02F9 for ; Tue, 5 Mar 2013 02:35:43 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UCXQP-0002vm-PT; Mon, 04 Mar 2013 15:35:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UCXQN-0002vF-Kx for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2013 15:35:35 +0000 Received: from [188.250.140.116] (helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UCXQN-0002i9-FN for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2013 15:35:35 +0000 From: Luis Henriques To: kernel-team@lists.ubuntu.com Subject: [PATCH SRU Quantal] UBUNTU: [Config] CONFIG_NFS_V4_1=y Date: Mon, 4 Mar 2013 15:35:32 +0000 Message-Id: <1362411332-16054-2-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362411332-16054-1-git-send-email-luis.henriques@canonical.com> References: <1362411332-16054-1-git-send-email-luis.henriques@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 BugLink: http://bugs.launchpad.net/bugs/1111416 Signed-off-by: Luis Henriques --- debian.master/config/config.common.ubuntu | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bcc55f5..e31f5ba 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3774,7 +3774,8 @@ CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFTL=m CONFIG_NFTL_RW=y CONFIG_NF_CONNTRACK=m @@ -4193,6 +4194,9 @@ CONFIG_PM_WAKELOCKS_GC=y CONFIG_PM_WAKELOCKS_LIMIT=100 CONFIG_PN544_HCI_NFC=m CONFIG_PN544_NFC=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_OBJLAYOUT=m CONFIG_PNP=y CONFIG_PNPACPI=y CONFIG_PNPBIOS=y @@ -5472,6 +5476,7 @@ CONFIG_SUNDANCE=m CONFIG_SUNGEM=m CONFIG_SUNGEM_PHY=m CONFIG_SUNRPC=m +CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_SUNRPC_DEBUG is not set CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m