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

[XFS] Fix merge failures

Browse Source 
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Lachlan McIlroy
2008-12-29 16:47:18 +11:00
parent 25051158bb 3c92ec8ae9
commit 0a8c5395f9
2880 changed files with 144424 additions and 81686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/linux-2.6/xfs_cred.h
View File

@ -23,8 +23,6 @@
/*
* Credentials
*/
typedef struct cred {
/* EMPTY */
} cred_t;
typedef const struct cred cred_t;
#endif /* __XFS_CRED_H__ */