d9bc125caf
Conflicts: net/sunrpc/auth_gss/gss_krb5_crypto.c net/sunrpc/auth_gss/gss_spkm3_token.c net/sunrpc/clnt.c Merge with mainline and fix conflicts. |
||
|---|---|---|
| .. | ||
| auth_gss.c | ||
| gss_generic_token.c | ||
| gss_krb5_crypto.c | ||
| gss_krb5_mech.c | ||
| gss_krb5_seal.c | ||
| gss_krb5_seqnum.c | ||
| gss_krb5_unseal.c | ||
| gss_krb5_wrap.c | ||
| gss_mech_switch.c | ||
| gss_spkm3_mech.c | ||
| gss_spkm3_seal.c | ||
| gss_spkm3_token.c | ||
| gss_spkm3_unseal.c | ||
| Makefile | ||
| svcauth_gss.c | ||