gss_krb5: handle new context format from gssd

For encryption types other than DES, gssd sends down context information
in a new format.  This new format includes the information needed to
support the new Kerberos GSS-API tokens defined in rfc4121.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

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

diff --cc net/sunrpc/auth_gss/gss_krb5_keys.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_krb5_mech.c
Simple merge