davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
cace673d37
kernel-ark/fs/nfs
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
callback_proc.c [PATCH] fs/nfs/callback* passes error values big-endian 2006-10-20 10:26:40 -07:00
callback_xdr.c [PATCH] xdr annotations: fs/nfs/callback* 2006-10-20 10:26:40 -07:00
callback.c [PATCH] knfsd: Drop 'serv' option to svc_recv and svc_process 2006-10-02 07:57:18 -07:00
callback.h [PATCH] xdr annotations: fs/nfs/callback* 2006-10-20 10:26:40 -07:00
client.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
delegation.c
delegation.h
dir.c [PATCH] NFS: Cache invalidation fixup 2006-10-21 13:35:06 -07:00
direct.c [PATCH] NFS: Deal with failure of invalidate_inode_pages2() 2006-10-20 10:26:39 -07:00
file.c
getroot.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
idmap.c
inode.c [PATCH] NFS: __nfs_revalidate_inode() can use "inode" before checking it is non-NULL 2006-10-20 10:26:39 -07:00
internal.h [PATCH] xdr annotations: NFS readdir entries 2006-10-20 10:26:40 -07:00
iostat.h
Makefile
mount_clnt.c [PATCH] xdr annotations: mount_clnt 2006-10-20 10:26:41 -07:00
namespace.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
nfs2xdr.c [PATCH] xdr annotations: NFS readdir entries 2006-10-20 10:26:40 -07:00
nfs3acl.c
nfs3proc.c [PATCH] nfs: verifier is network-endian 2006-10-20 10:26:40 -07:00
nfs3xdr.c [PATCH] xdr annotations: NFS readdir entries 2006-10-20 10:26:40 -07:00
nfs4_fs.h WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
nfs4namespace.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
nfs4proc.c [PATCH] nfs: verifier is network-endian 2006-10-20 10:26:40 -07:00
nfs4renewd.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
nfs4state.c
nfs4xdr.c [PATCH] xdr annotations: NFS readdir entries 2006-10-20 10:26:40 -07:00
nfsroot.c [NET]: ipconfig and nfsroot annotations 2006-12-02 21:21:09 -08:00
pagelist.c
proc.c
read.c
super.c [PATCH] NFSv4: Fix thinko in fs/nfs/super.c 2006-10-20 10:26:38 -07:00
symlink.c
sysctl.c [PATCH] sysctl: implement CTL_UNNUMBERED 2006-11-06 01:46:23 -08:00
unlink.c
write.c [PATCH] NFS: Fix oops in nfs_cancel_commit_list 2006-10-20 10:26:38 -07:00