TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
This commit is contained in:
Trond Myklebust
2006-12-07 15:48:15 -05:00
parent 5847e1f4d0 620034c84d
commit 34161db6b1
558 changed files with 8324 additions and 5256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/rpc_pipe_fs.h
View File

@@ -30,7 +30,7 @@ struct rpc_inode {
#define RPC_PIPE_WAIT_FOR_OPEN 1
int flags;
struct rpc_pipe_ops *ops;
struct work_struct queue_timeout;
struct delayed_work queue_timeout;
};
static inline struct rpc_inode *