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

rpc: gss: eliminate print_hexl()'s

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

auth.h

[PATCH] knfsd: Prepare knfsd for support of rsize/wsize of up to 1MB, over TCP

2006-10-04 07:55:16 -07:00

cache.h

[PATCH] knfsd: knfsd: cache ipmap per TCP socket

2006-10-04 07:55:16 -07:00

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

fix file specification in comments

2006-10-03 23:01:26 +02:00

gss_asn1.h

…

gss_err.h

…

gss_krb5.h

rpcgss: krb5: ignore seed

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

gss_spkm3.h

rpc: spkm3 update

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

Kbuild

[HEADERS] One line per header in Kbuild files to reduce conflicts

2006-09-19 12:43:58 +01:00

metrics.h

NFS: fix PROC_FS=n compile error

2006-04-19 12:43:46 -04:00

msg_prot.h

[PATCH] knfsd: Allow lockd to drop replies as appropriate

2006-10-17 08:18:46 -07:00

rpc_pipe_fs.h

WorkStruct: Separate delayable and non-delayable events.

2006-11-22 14:54:01 +00:00

sched.h

RPC: Clean up rpc_execute...

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

stats.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

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

fix file specification in comments

2006-10-03 23:01:26 +02:00

svcauth.h

[PATCH] knfsd: knfsd: cache ipmap per TCP socket

2006-10-04 07:55:16 -07:00

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