Re; [PATCH v2 14/14] NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4

[Geert Uytterhoeven]

> Compiling the NFSv4 module without any minorversion support doesn't make
> much sense, so this patch sets NFS v4.1 as the default, always enabled
> NFS version allowing us to replace all the CONFIG_NFS_V4_1s scattered
> throughout the code with CONFIG_NFS_V4.
> 
> Signed-off-by: Anna Schumaker <anna.schumaker@xxxxxxxxxx>

Thanks for your patch, which is now commit 7537db24806fdc3d ("NFS:
Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4") upstream.

> --- a/fs/nfs/Kconfig
> +++ b/fs/nfs/Kconfig
> @@ -78,9 +78,10 @@ config NFS_V4
>  	tristate "NFS client support for NFS version 4"
>  	depends on NFS_FS
>  	select KEYS
> +	select SUNRPC_BACKCHANNEL
>  	help
> -	  This option enables support for version 4 of the NFS protocol
> -	  (RFC 3530) in the kernel's NFS client.
> +	  This option enables support for version 4.1 of the NFS protocol
> +	  (RFC 5661) in the kernel's NFS client.
>  
>  	  To mount NFS servers using NFSv4, you also need to install user
>  	  space programs which can be found in the Linux nfs-utils package,

And out of context:

    If unsure, say Y.

Shouldn't that become "N", cfr. the old NFS_V4_1 below?

And shouldn't all configs currently enabling CONFIG_NFS_V4, but not
CONFIG_NFS_V4_1, be updated to disable CONFIG_NFS_V4?

> @@ -105,19 +106,9 @@ config NFS_V4_0
>  
>  	  If unsure, say N.
>  
> -config NFS_V4_1
> -	bool "NFS client support for NFSv4.1"
> -	depends on NFS_V4
> -	select SUNRPC_BACKCHANNEL
> -	help
> -	  This option enables support for minor version 1 of the NFSv4 protocol
> -	  (RFC 5661) in the kernel's NFS client.
> -
> -	  If unsure, say N.
> -
>  config NFS_V4_2
>  	bool "NFS client support for NFSv4.2"
> -	depends on NFS_V4_1
> +	depends on NFS_V4
>  	help
>  	  This option enables support for minor version 2 of the NFSv4 protocol
>  	  in the kernel's NFS client.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds