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 56a79b7b02 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs ... Pull more VFS bits from Al Viro: "Unfortunately, it looks like xattr series will have to wait until the next cycle ;-/ This pile contains 9p cleanups and fixes (races in v9fs_fid_add() etc), fixup for nommu breakage in shmem.c, several cleanups and a bit more file_inode() work" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: constify path_get/path_put and fs_struct.c stuff fix nommu breakage in shmem.c cache the value of file_inode() in struct file 9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry 9p: make sure ->lookup() adds fid to the right dentry 9p: untangle ->lookup() a bit 9p: double iput() in ->lookup() if d_materialise_unique() fails 9p: v9fs_fid_add() can't fail now v9fs: get rid of v9fs_dentry 9p: turn fid->dlist into hlist 9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine more file_inode() open-coded instances selinux: opened file can't have NULL or negative ->f_path.dentry (In the meantime, the hlist traversal macros have changed, so this required a semantic conflict fixup for the newly hlistified fid->dlist)		12 years ago
..
apparmor	new helper: file_inode(file)	12 years ago
integrity	hlist: drop the node parameter from iterators	12 years ago
keys	KEYS: Revert one application of "Fix unreachable code" patch	12 years ago
selinux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
smack	new helper: file_inode(file)	12 years ago
tomoyo	new helper: file_inode(file)	12 years ago
yama	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	12 years ago
Kconfig	KEYS: Move the key config into security/keys/Kconfig	13 years ago
Makefile	…
capability.c	tun: fix LSM/SELinux labeling of tun/tap devices	12 years ago
commoncap.c	kill f_vfsmnt	12 years ago
device_cgroup.c	device_cgroup: don't grab mutex in rcu callback	12 years ago
inode.c	…
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	13 years ago
min_addr.c	…
security.c	tun: fix LSM/SELinux labeling of tun/tap devices	12 years ago