Trond Myklebust d9bc125caf Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

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.

2007-02-12 22:43:25 -08:00

..

auth_gss.h

…

auth.h

…

cache.h

…

clnt.h

NFS: disconnect before retrying NFSv4 requests over TCP

2007-02-12 22:40:45 -08:00

debug.h

SUNRPC: Remove pprintk() from net/sunrpc/xprt.c

2006-12-06 10:46:55 -05:00

gss_api.h

…

gss_asn1.h

…

gss_err.h

…

gss_krb5.h

rpcgss: krb5: ignore seed

2006-12-06 10:46:47 -05:00

gss_spkm3.h

…

Kbuild

…

metrics.h

…

msg_prot.h

…

rpc_pipe_fs.h

…

sched.h

RPC: Clean up rpc_execute...

2007-02-03 15:35:03 -08:00

stats.h

…

svc.h

[PATCH] knfsd: SUNRPC: support IPv6 addresses in RPC server's UDP receive path

2007-02-12 09:48:36 -08:00

svcauth_gss.h

…

svcauth.h

…

svcsock.h

[PATCH] knfsd: SUNRPC: Cache remote peer's address in svc_sock

2007-02-12 09:48:35 -08:00

timer.h

…

types.h

…

xdr.h

SUNRPC: Rename skb_reader_t and friends

2006-12-06 10:46:52 -05:00

xprt.h

SUNRPC: Make address format buffers more generic

2006-12-06 10:46:51 -05:00