lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Browse Source 
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.
This commit is contained in:
Trond Myklebust
2007-02-12 22:43:25 -08:00
parent 43d78ef2ba ec2f9d1331
commit d9bc125caf
3871 changed files with 178716 additions and 91647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/sunrpc/auth_gss/svcauth_gss.c
View File

@@ -172,8 +172,8 @@ static struct cache_head *rsi_alloc(void)
}
static void rsi_request(struct cache_detail *cd,
struct cache_head *h,
char **bpp, int *blen)
struct cache_head *h,
char **bpp, int *blen)
{
struct rsi *rsii = container_of(h, struct rsi, h);
@@ -184,7 +184,7 @@ static void rsi_request(struct cache_detail *cd,
static int rsi_parse(struct cache_detail *cd,
char *mesg, int mlen)
char *mesg, int mlen)
{
/* context token expiry major minor context token */
char *buf = mesg;