Merge remote-tracking branch 'nfs/linux-next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/super.c
index d2c7f5db0847656bb0f2a9d109b5ad9fc8af5cbc,b4079bbd30ddaf439df94721d72767e11621f5cd..e831bce497663e809e48bb7cc278f5ad6a74ba7b
--- 1/fs/nfs/super.c
--- 2/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@@ -1535,9 -1547,13 +1547,13 @@@ static int nfs_parse_mount_options(cha
        if (mnt->minorversion && mnt->version != 4)
                goto out_minorversion_mismatch;
  
+       if (mnt->options & NFS_OPTION_MIGRATION &&
+           mnt->version != 4 && mnt->minorversion != 0)
+               goto out_migration_misuse;
+ 
        /*
         * verify that any proto=/mountproto= options match the address
 -       * familiies in the addr=/mountaddr= options.
 +       * families in the addr=/mountaddr= options.
         */
        if (protofamily != AF_UNSPEC &&
            protofamily != mnt->nfs_server.address.ss_family)