[SRU][H/kvm][PATCH] UBUNTU: [Config] kvm-21.04: Enable NFSv4

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1907266

Enable the NFSv4 module and all its dependencies. These config settings
now match the master kernel.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.kvm-21.04/config/config.common.ubuntu | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian.kvm-21.04/config/config.common.ubuntu b/debian.kvm-21.04/config/config.common.ubuntu
index d3d13b300501..40aeda8a85ca 100644
--- a/debian.kvm-21.04/config/config.common.ubuntu
+++ b/debian.kvm-21.04/config/config.common.ubuntu
@@ -1780,10 +1780,17 @@ CONFIG_NFS_COMMON=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFS_FS=m
 # CONFIG_NFS_SWAP is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_V2=m
 CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFTL is not set
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
@@ -2118,6 +2125,9 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_PMC_ATOM=y
 CONFIG_PMIC_OPREGION=y
 # CONFIG_PM_DEVFREQ is not set
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y
@@ -2497,6 +2507,7 @@ CONFIG_STRICT_MODULE_RWX=y
 # CONFIG_STRING_SELFTEST is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUNRPC=m
+CONFIG_SUNRPC_BACKCHANNEL=y
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_GSS=m
-- 
2.25.1