iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
Lachlan McIlroy 0a8c5395f9 [XFS] Fix merge failures 
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>
2008-12-29 16:47:18 +11:00
..
9p
Merge branch 'next' into for-linus
2008-12-25 11:40:09 +11:00
adfs
vfs: Use const for kernel parser table
2008-10-13 10:10:37 -07:00
affs
CRED: Wrap task credential accesses in the AFFS filesystem
2008-11-14 10:38:45 +11:00
afs
fs: replace NIPQUAD()
2008-10-31 00:56:28 -07:00
autofs
CRED: Wrap task credential accesses in the autofs filesystem
2008-11-14 10:38:45 +11:00
autofs4
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
befs
befs: annotate fs32 on tests for superblock endianness
2008-10-16 11:21:46 -07:00
bfs
CRED: Wrap task credential accesses in the BFS filesystem
2008-11-14 10:38:47 +11:00
cifs
cifs: update for new IP4/6 address printing
2008-12-28 16:29:58 -08:00
coda
coda: fix creds reference
2008-11-20 08:11:52 +11:00
configfs
[PATCH] assorted path_lookup() -> kern_path() conversions
2008-10-23 05:12:52 -04:00
cramfs
cramfs: fix named-pipe handling
2008-08-20 15:40:32 -07:00
debugfs
integrity: special fs magic
2008-10-13 09:47:43 +11:00
devpts
CRED: Wrap task credential accesses in the devpts filesystem
2008-11-14 10:38:49 +11:00
dlm
fix warning in fs/dlm/netlink.c
2008-11-25 16:51:45 -08:00
ecryptfs
Merge branch 'master' into next
2008-12-04 17:16:36 +11:00
efs
[PATCH] switch all filesystems over to d_obtain_alias
2008-10-23 05:13:01 -04:00
exportfs
Merge branch 'next' into for-linus
2008-12-25 11:40:09 +11:00
ext2
CRED: Wrap task credential accesses in the Ext2 filesystem
2008-11-14 10:38:50 +11:00
ext3
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
ext4
Merge branch 'next' into for-linus
2008-12-25 11:40:09 +11:00
fat
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
freevxfs
…
fuse
CRED: Use RCU to access another task's creds and to release a task's own creds
2008-11-14 10:39:19 +11:00
gfs2
CRED: Wrap task credential accesses in the GFS2 filesystem
2008-11-14 10:38:53 +11:00
hfs
CRED: Wrap task credential accesses in the HFS filesystem
2008-11-14 10:38:54 +11:00
hfsplus
CRED: Wrap task credential accesses in the HFSplus filesystem
2008-11-14 10:38:54 +11:00
hostfs
hostfs: fix a duplicated global function name
2008-11-19 18:50:00 -08:00
hpfs
CRED: Wrap task credential accesses in the HPFS filesystem
2008-11-14 10:38:55 +11:00
hppfs
CRED: Use creds in file structs
2008-11-14 10:39:25 +11:00
hugetlbfs
CRED: Wrap current->cred and a few other accessors
2008-11-14 10:39:18 +11:00
isofs
[PATCH] switch all filesystems over to d_obtain_alias
2008-10-23 05:13:01 -04:00
jbd
jbd: don't give up looking for space so easily in __log_wait_for_space
2008-11-06 22:37:59 -05:00
jbd2
jbd2: don't give up looking for space so easily in __jbd2_log_wait_for_space
2008-11-06 22:38:07 -05:00
jffs2
Merge git://git.infradead.org/mtd-2.6
2008-11-06 15:43:13 -08:00
jfs
CRED: Wrap task credential accesses in the JFS filesystem
2008-11-14 10:38:56 +11:00
lockd
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-12-15 20:03:50 -08:00
minix
CRED: Wrap task credential accesses in the Minix filesystem
2008-11-14 10:38:57 +11:00
ncpfs
CRED: Wrap task credential accesses in the NCPFS filesystem
2008-11-14 10:38:58 +11:00
nfs
fs: replace NIPQUAD()
2008-10-31 00:56:28 -07:00
nfs_common
…
nfsd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
nls
remove CONFIG_KMOD from fs
2008-10-17 02:38:36 +11:00
ntfs
ntfs: don't fool kernel-doc
2008-12-01 19:55:25 -08:00
ocfs2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2008-12-28 12:49:40 -08:00
omfs
CRED: Wrap task credential accesses in the OMFS filesystem
2008-11-14 10:38:59 +11:00
openpromfs
[PATCH] fix ->llseek for more directories
2008-10-23 05:13:21 -04:00
partitions
block/md: fix md autodetection
2008-11-18 15:08:56 +01:00
proc
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
2008-12-28 16:54:33 -08:00
qnx4
SL*B: drop kmem cache argument from constructor
2008-07-26 12:00:07 -07:00
ramfs
CRED: Wrap task credential accesses in the RAMFS filesystem
2008-11-14 10:39:00 +11:00
reiserfs
CRED: Wrap task credential accesses in the ReiserFS filesystem
2008-11-14 10:39:01 +11:00
romfs
romfs_readpage: don't report errors for pages beyond i_size
2008-07-30 14:30:34 -07:00
smbfs
CRED: Wrap current->cred and a few other accessors
2008-11-14 10:39:18 +11:00
sysfs
[PATCH] fix ->llseek for more directories
2008-10-23 05:13:21 -04:00
sysv
CRED: Wrap task credential accesses in the SYSV filesystem
2008-11-14 10:39:02 +11:00
ubifs
Merge branch 'master' into next
2008-12-04 17:16:36 +11:00
udf
Merge branch 'master' into next
2008-12-04 17:16:36 +11:00
ufs
CRED: Wrap task credential accesses in the UFS filesystem
2008-11-14 10:39:04 +11:00
xfs
[XFS] Fix merge failures
2008-12-29 16:47:18 +11:00
aio.c
[PATCH] f_count may wrap around
2008-07-26 20:53:40 -04:00
anon_inodes.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
attr.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
bad_inode.c
[PATCH] sanitize ->permission() prototype
2008-07-26 20:53:14 -04:00
binfmt_aout.c
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
binfmt_elf_fdpic.c
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
binfmt_elf.c
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
2008-12-28 12:33:21 -08:00
binfmt_em86.c
Allow recursion in binfmt_script and binfmt_misc
2008-10-16 11:21:38 -07:00
binfmt_flat.c
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
binfmt_misc.c
Allow recursion in binfmt_script and binfmt_misc
2008-10-16 11:21:38 -07:00
binfmt_script.c
Allow recursion in binfmt_script and binfmt_misc
2008-10-16 11:21:38 -07:00
binfmt_som.c
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
bio-integrity.c
block: Introduce integrity data ownership flag
2008-10-09 08:56:21 +02:00
bio.c
blktrace: port to tracepoints, update
2008-11-26 13:04:35 +01:00
block_dev.c
[PATCH 1/2] kill FMODE_NDELAY_NOW
2008-12-04 04:22:57 -05:00
buffer.c
udf: Fix BUG_ON() in destroy_inode()
2008-11-27 17:38:28 +01:00
char_dev.c
[PATCH] tidy up chrdev_open
2008-10-23 05:12:59 -04:00
compat_binfmt_elf.c
…
compat_ioctl.c
remove unused #include <linux/dirent.h>'s
2008-07-25 10:53:34 -07:00
compat.c
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
dcache.c
[PATCH] fs: add a sanity check in d_free
2008-10-23 05:17:12 -04:00
dcookies.c
…
direct-io.c
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
dnotify.c
…
dquot.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
drop_caches.c
…
eventfd.c
flag parameters: check magic constants
2008-07-24 10:47:29 -07:00
eventpoll.c
epoll: introduce resource usage limits
2008-12-01 19:55:24 -08:00
exec.c
Merge branch 'next' into for-linus
2008-12-25 11:40:09 +11:00
fcntl.c
Merge branch 'next' into for-linus
2008-12-25 11:40:09 +11:00
fifo.c
[PATCH] introduce fmode_t, do annotations
2008-10-21 07:47:06 -04:00
file_table.c
CRED: Use creds in file structs
2008-11-14 10:39:25 +11:00
file.c
[PATCH] merge locate_fd() and get_unused_fd()
2008-08-01 11:25:23 -04:00
filesystems.c
proc: move /proc/filesystems to fs/filesystems.c
2008-10-23 14:27:09 +04:00
fs-writeback.c
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
generic_acl.c
…
inode.c
fs: xfs needs inode_wait to be exported
2008-11-10 17:06:05 +11:00
inotify_user.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
inotify.c
inotify: fix IN_ONESHOT unmount event watcher
2008-12-10 08:01:53 -08:00
internal.h
CRED: Make execve() take advantage of copy-on-write credentials
2008-11-14 10:39:24 +11:00
ioctl.c
Fix a race condition in FASYNC handling
2008-12-05 15:35:10 -08:00
ioprio.c
CRED: Use RCU to access another task's creds and to release a task's own creds
2008-11-14 10:39:19 +11:00
Kconfig
[patch 1/3] FS_MBCACHE: don't needlessly make it built-in
2008-10-23 05:13:26 -04:00
Kconfig.binfmt
add CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS
2008-10-20 08:52:39 -07:00
libfs.c
fs: remove prepare_write/commit_write
2008-10-30 11:38:45 -07:00
locks.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
Makefile
fat: move fs/vfat/* and fs/msdos/* to fs/fat
2008-11-06 15:41:20 -08:00
mbcache.c
…
mpage.c
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
namei.c
Merge branch 'master' into next
2008-12-04 17:16:36 +11:00
namespace.c
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
nfsctl.c
nfsctl: add headers for credentials
2008-11-20 08:11:55 +11:00
no-block.c
…
open.c
CRED: Inaugurate COW credentials
2008-11-14 10:39:23 +11:00
pipe.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
pnode.c
…
pnode.h
…
posix_acl.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
quota_v1.c
quota: move function-macros from quota.h to quotaops.h
2008-07-25 10:53:35 -07:00
quota_v2.c
quota: move function-macros from quota.h to quotaops.h
2008-07-25 10:53:35 -07:00
quota.c
CRED: Wrap task credential accesses in the filesystem subsystem
2008-11-14 10:39:05 +11:00
read_write.c
[PATCH] generic_file_llseek tidyups
2008-10-23 05:12:59 -04:00
read_write.h
…
readdir.c
[PATCH] prepare vfs_readdir() callers to returning filldir result
2008-10-23 05:13:10 -04:00
select.c
select: deal with math overflow from borderline valid userland data
2008-10-26 11:22:08 -07:00
seq_file.c
vfs, seqfile: export mangle_path() generally
2008-11-28 18:07:10 +01:00
signalfd.c
flag parameters: check magic constants
2008-07-24 10:47:29 -07:00
splice.c
fs: remove prepare_write/commit_write
2008-10-30 11:38:45 -07:00
stack.c
…
stat.c
[PATCH] sanitize __user_walk_fd() et.al.
2008-07-26 20:53:34 -04:00
super.c
security: pass mount flags to security_sb_kern_mount()
2008-12-20 09:02:39 +11:00
sync.c
SYNC_FILE_RANGE_WRITE may and will block. Document that.
2008-07-24 10:47:17 -07:00
timerfd.c
hrtimer: convert timerfd to the new hrtimer apis
2008-09-05 21:35:09 -07:00
utimes.c
[PATCH] sanitize __user_walk_fd() et.al.
2008-07-26 20:53:34 -04:00
xattr_acl.c
…
xattr.c
[PATCH] sanitize __user_walk_fd() et.al.
2008-07-26 20:53:34 -04:00