main/linux-vanilla: enable NFS v4.1 & v4.2

AWS Elastic File System works best with NFS v4.1, Docker's cloudstor:aws plugin requires it.
This is already enabled in config-vanilla.s390x; simply enabling it in the other configs.

9 files changed, 73 insertions, 17 deletions

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index e4a9fa88dd..b84dd64974 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs"
@@ -222,13 +222,13 @@ _dev() {
 
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
-b7d8a264cdd08b2661710d4326ec7bbaa35363dd19a390a7ffaf157eadb59291e1c6f027fbc242e7851e17d7721a7fc8cbd4642327e52398fd8634e8ef742061  config-vanilla.aarch64
-251b9498b18929724b084718085709ba4f899820f3373231744918f7bc1d8d02554529ddcf249a6e952e55eb2c3d908c6fc2dacc773a44a3587e48dbdf3dd358  config-vanilla.armhf
-052ccc49fdefe0d8ed3e6119a1ab632a7b9020ea9cbb54b8055f1e45334244a3dd8534fed3bc2f3f9a3bcb9363795d48fc4c6c48cf7032f6202b09971dc9e181  config-vanilla.x86
-41729137917ee5e06a76ce2c2b4d1d153eb493efb7a9cd7881367934db9ad8d9a9251071923d8d26f1e7a030d702f4dd66e24d4d26a294f957db27bb42f9d40d  config-vanilla.x86_64
-03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b  config-vanilla.ppc
-f60b743952c080a4f8e61930034e2c8f173fbd321d5ebdec92023319c5f6335ed3e1ba04921b6e83f938fd2d32ca29aac14747650cd96608c69053764164ce35  config-vanilla.ppc64le
+2429433ce9e0bbf0a400f6e0a0bc25730a66f74d3365793063252239cfec8fcaa9af5c99d0933f0b239ec9b2e28645bbc05e7e150a90c0a481c2870a03c902e4  config-vanilla.aarch64
+efb7bd5c1b380aa3db62c381c460d20a63f92260d9a6925e9839f8ccb1cce9b3531f56174b633e64a1dd1aaba43c6b23576089f7743143c52ce9301c301a538e  config-vanilla.armhf
+0206981c09a8a3c6f3261b0a6722324629a6d8d4da9872923bb85cb1a43756c95833331c65ef63ec040e86aa8ed616a6623b74c36f1aa98138c0212102814c7f  config-vanilla.x86
+24299e75c037f965115fbf11ac5de0d7f9f530b10451c3453b98d73c6a23da527ee3b342b52876394bcbf8fd7ccb2da26003546888548528c3a3d2dda76dec50  config-vanilla.x86_64
+96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db  config-vanilla.ppc
+adc20244550d66da34de747a0b7dccf3bbc86a46491e97de4c17e9873c1a4578b7afd31717c0a8ba7c45e99e5399352dd36ce8fa9561789d354f2447ad6c65d0  config-vanilla.ppc64le
 10ecea3e0a101a898e347a42d74f9a3d8f226153cf487e1d65f59fb557b6fdaccab0d2ad6cf705c6cdeb5ed053eb7c5edecc655b3700e4ba237e965c0b6e417e  config-vanilla.s390x
-72e31d5a1c929c15a96e80b72c332751af4a2d7becbf30ef36e9ccda62038075e77381ceda612d49ea6324f0a087e4312c66eb2df9406aa132a62eee6f303c7f  config-virt.x86
-dd40f51d6f69d34ef4c46cf25c5330905937888ebd0773764071f7fa9439c76556e0370f0b59de2f93dd16aaa913704b39e6e266fd75c6fda637e313f4ded847  config-virt.x86_64
+830f568c91a17cfc57b5458a9b949c343b87ee160a7e27f50010be0ff8e5f80163114b8852dec5a8ce2849ddd99a2530c67dbb818c41a0c69e241fc87e5ff145  config-virt.x86
+5c9b45399dc4477e37e350e763b869a30e3b52815ba60208b805147f16316221d017d0a593f1f2911aeaf89d73f5603e06f7e478b19db4fad49ce15025ec28e6  config-virt.x86_64
 d509365295b6bb5ad55d8859a6cc7cae00ef7b7b34aef21167fcfc992accbf9ac1f4191446c911b55844b09ff0c7f83fd422aea71c2877521331b7b0e05a9205  patch-4.14.73.xz"
diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64
index f53bc23924..24bc56496b 100644
--- a/main/linux-vanilla/config-vanilla.aarch64
+++ b/main/linux-vanilla/config-vanilla.aarch64
@@ -6796,7 +6796,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf
index 7202c19894..a687ae42bb 100644
--- a/main/linux-vanilla/config-vanilla.armhf
+++ b/main/linux-vanilla/config-vanilla.armhf
@@ -5526,7 +5526,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
diff --git a/main/linux-vanilla/config-vanilla.ppc b/main/linux-vanilla/config-vanilla.ppc
index 8cd4b0397b..23720e922a 100644
--- a/main/linux-vanilla/config-vanilla.ppc
+++ b/main/linux-vanilla/config-vanilla.ppc
@@ -3197,7 +3197,14 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFSD=m
diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le
index 5de5ec0ec0..ec43be4568 100644
--- a/main/linux-vanilla/config-vanilla.ppc64le
+++ b/main/linux-vanilla/config-vanilla.ppc64le
@@ -3353,7 +3353,14 @@ CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFSD=m
diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86
index 4483ae192b..59c6a565a0 100644
--- a/main/linux-vanilla/config-vanilla.x86
+++ b/main/linux-vanilla/config-vanilla.x86
@@ -6581,7 +6581,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64
index 6566dfd6be..e2a5aa1094 100644
--- a/main/linux-vanilla/config-vanilla.x86_64
+++ b/main/linux-vanilla/config-vanilla.x86_64
@@ -6636,7 +6636,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86
index 1742693b53..fd32254f7c 100644
--- a/main/linux-vanilla/config-virt.x86
+++ b/main/linux-vanilla/config-virt.x86
@@ -3545,7 +3545,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64
index 35c9983148..99441f56e7 100644
--- a/main/linux-vanilla/config-virt.x86_64
+++ b/main/linux-vanilla/config-virt.x86_64
@@ -3648,7 +3648,14 @@ CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y