Merge branch 'nfs-rdma'

diff --cc include/linux/sunrpc/auth.h
Simple merge

diff --cc net/sunrpc/auth_gss/auth_gss.c
index 813a3cdfb573609884460077e8900a63e21f81f8,bca3537efffdf39cd7bdf50bf4469d70d0576d9c..23c8e7c3965651ad5ee03ee617ad92d06646802f
--- 1/net/sunrpc/auth_gss/auth_gss.c
--- 2/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@@ -1015,9 -1015,10 +1015,11 @@@ gss_create_new(struct rpc_auth_create_a
        auth = &gss_auth->rpc_auth;
        auth->au_cslack = GSS_CRED_SLACK >> 2;
        auth->au_rslack = GSS_VERF_SLACK >> 2;
 +      auth->au_flags = 0;
        auth->au_ops = &authgss_ops;
        auth->au_flavor = flavor;
+       if (gss_pseudoflavor_to_datatouch(gss_auth->mech, flavor))
+               auth->au_flags |= RPCAUTH_AUTH_DATATOUCH;
        atomic_set(&auth->au_count, 1);
        kref_init(&gss_auth->kref);