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 790eac5640 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs ... Pull second set of VFS changes from Al Viro: "Assorted f_pos race fixes, making do_splice_direct() safe to call with i_mutex on parent, O_TMPFILE support, Jeff's locks.c series, ->d_hash/->d_compare calling conventions changes from Linus, misc stuff all over the place." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits) Document ->tmpfile() ext4: ->tmpfile() support vfs: export lseek_execute() to modules lseek_execute() doesn't need an inode passed to it block_dev: switch to fixed_size_llseek() cpqphp_sysfs: switch to fixed_size_llseek() tile-srom: switch to fixed_size_llseek() proc_powerpc: switch to fixed_size_llseek() ubi/cdev: switch to fixed_size_llseek() pci/proc: switch to fixed_size_llseek() isapnp: switch to fixed_size_llseek() lpfc: switch to fixed_size_llseek() locks: give the blocked_hash its own spinlock locks: add a new "lm_owner_key" lock operation locks: turn the blocked_list into a hashtable locks: convert fl_link to a hlist_node locks: avoid taking global lock if possible when waking up blocked waiters locks: protect most of the file_lock handling with i_lock locks: encapsulate the fl_link list handling locks: make "added" in __posix_lock_file a bool ...		12 years ago
..
apparmor	new helper: file_inode(file)	12 years ago
integrity	Replace a bunch of file->dentry->d_inode refs with file_inode()	12 years ago
keys	aio: don't include aio.h in sched.h	12 years ago
selinux	SELinux: Institute file_path_has_perm()	12 years ago
smack	Smack: include magic.h in smackfs.c	12 years ago
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
yama	yama: Better permission check for ptraceme	12 years ago
Kconfig	KEYS: Move the key config into security/keys/Kconfig	13 years ago
Makefile	security: Yama LSM	13 years ago
capability.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	12 years ago
commoncap.c	kill f_vfsmnt	12 years ago
device_cgroup.c	device_cgroup: simplify cgroup tree walk in propagate_exception()	12 years ago
inode.c	securityfs: fix object creation races	13 years ago
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	13 years ago
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	15 years ago
security.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	12 years ago