You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits) direct I/O fallback sync simplification ocfs: stop using do_sync_mapping_range cleanup blockdev_direct_IO locking make generic_acl slightly more generic sanitize xattr handler prototypes libfs: move EXPORT_SYMBOL for d_alloc_name vfs: force reval of target when following LAST_BIND symlinks (try #7) ima: limit imbalance msg Untangling ima mess, part 3: kill dead code in ima Untangling ima mess, part 2: deal with counters Untangling ima mess, part 1: alloc_file() O_TRUNC open shouldn't fail after file truncation ima: call ima_inode_free ima_inode_free IMA: clean up the IMA counts updating code ima: only insert at inode creation time ima: valid return code from ima_inode_alloc fs: move get_empty_filp() deffinition to internal.h Sanitize exec_permission_lite() Kill cached_lookup() and real_lookup() Kill path_lookup_open() ... Trivial conflicts in fs/direct-io.c		15 years ago
..
Kconfig	fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out	17 years ago
Makefile	switch ext2 to simple_fsync()	16 years ago
acl.c	sanitize xattr handler prototypes	15 years ago
acl.h	ext[234]: move over to 'check_acl' permission model	16 years ago
balloc.c	ext2: Use lowercase names of quota functions	16 years ago
dir.c	ext2: report metadata errors during fsync	15 years ago
ext2.h	ext2: report metadata errors during fsync	15 years ago
file.c	ext2: report metadata errors during fsync	15 years ago
ialloc.c	ext2: Use lowercase names of quota functions	16 years ago
inode.c	ext2: Unify log messages in ext2	15 years ago
ioctl.c	headers: smp_lock.h redux	16 years ago
namei.c	ext2: fix format string compile warning (ino_t)	16 years ago
super.c	ext2: avoid WARN() messages when failing to write to the superblock	15 years ago
symlink.c	…
xattr.c	sanitize xattr handler prototypes	15 years ago
xattr.h	…
xattr_security.c	sanitize xattr handler prototypes	15 years ago
xattr_trusted.c	sanitize xattr handler prototypes	15 years ago
xattr_user.c	sanitize xattr handler prototypes	15 years ago
xip.c	ext2: Unify log messages in ext2	15 years ago
xip.h	xip: support non-struct page backed memory	17 years ago