From patchwork Fri Jan 22 09:20:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 8088481 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A71EB9F440 for ; Fri, 22 Jan 2016 09:20:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D212620429 for ; Fri, 22 Jan 2016 09:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4408203F7 for ; Fri, 22 Jan 2016 09:20:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbcAVJUx (ORCPT ); Fri, 22 Jan 2016 04:20:53 -0500 Received: from mx2.suse.de ([195.135.220.15]:55318 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751987AbcAVJUw (ORCPT ); Fri, 22 Jan 2016 04:20:52 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B3DF0AC04; Fri, 22 Jan 2016 09:20:49 +0000 (UTC) Date: Fri, 22 Jan 2016 10:20:49 +0100 From: Jean Delvare To: linux-cifs@vger.kernel.org Cc: Steve French Subject: [PATCH 1/3] cifs: Simplify SMB2 and SMB311 dependencies Message-ID: <20160122102049.50a817a4@endymion.delvare> In-Reply-To: <20160122101654.20fa96e3@endymion.delvare> References: <20160122101654.20fa96e3@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * CIFS_SMB2 depends on CIFS, which depends on INET and selects NLS. So these dependencies do not need to be repeated for CIFS_SMB2. * CIFS_SMB311 depends on CIFS_SMB2, which depends on INET. So this dependency doesn't need to be repeated for CIFS_SMB311. Signed-off-by: Jean Delvare Cc: Steve French --- fs/cifs/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- linux-4.5-rc0.orig/fs/cifs/Kconfig 2016-01-11 00:01:32.000000000 +0100 +++ linux-4.5-rc0/fs/cifs/Kconfig 2016-01-22 09:48:02.217561471 +0100 @@ -169,8 +169,7 @@ config CIFS_NFSD_EXPORT config CIFS_SMB2 bool "SMB2 and SMB3 network file system support" - depends on CIFS && INET - select NLS + depends on CIFS select KEYS select FSCACHE select DNS_RESOLVER @@ -194,7 +193,7 @@ config CIFS_SMB2 config CIFS_SMB311 bool "SMB3.1.1 network file system support (Experimental)" - depends on CIFS_SMB2 && INET + depends on CIFS_SMB2 help This enables experimental support for the newest, SMB3.1.1, dialect.