Linus Torvalds 0f6e0e8448 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits) AppArmor: kill unused macros in lsm.c AppArmor: cleanup generated files correctly KEYS: Add an iovec version of KEYCTL_INSTANTIATE KEYS: Add a new keyctl op to reject a key with a specified error code KEYS: Add a key type op to permit the key description to be vetted KEYS: Add an RCU payload dereference macro AppArmor: Cleanup make file to remove cruft and make it easier to read SELinux: implement the new sb_remount LSM hook LSM: Pass -o remount options to the LSM SELinux: Compute SID for the newly created socket SELinux: Socket retains creator role and MLS attribute SELinux: Auto-generate security_is_socket_class TOMOYO: Fix memory leak upon file open. Revert "selinux: simplify ioctl checking" selinux: drop unused packet flow permissions selinux: Fix packet forwarding checks on postrouting selinux: Fix wrong checks for selinux_policycap_netpeer selinux: Fix check for xfrm selinux context algorithm ima: remove unnecessary call to ima_must_measure IMA: remove IMA imbalance checking ...		2011-03-16 09:15:43 -07:00
..
acl.c	GFS2: Post-VFS scale update for RCU path walk	2011-01-21 09:39:24 +00:00
acl.h
aops.c	GFS2: Adding missing unlock_page()	2011-03-14 13:19:21 +00:00
bmap.c	GFS2: deallocation performance patch	2011-02-24 12:13:48 +00:00
bmap.h
dentry.c	gfs2: fix d_revalidate oopsen on NFS exports	2011-03-10 03:44:48 -05:00
dir.c
dir.h
export.c	exportfs: Return the minimum required handle size	2011-03-14 09:15:28 -04:00
file.c	GFS2: fix block allocation check for fallocate	2011-03-11 09:26:48 +00:00
gfs2.h
glock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw	2011-03-16 08:58:43 -07:00
glock.h	GFS2: Fix glock deallocation race	2011-03-09 10:58:04 +00:00
glops.c	GFS2: introduce AIL lock	2011-03-11 11:52:25 +00:00
glops.h
incore.h	GFS2: introduce AIL lock	2011-03-11 11:52:25 +00:00
inode.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2011-03-08 11:38:10 +11:00
inode.h	GFS2: Fix error path in gfs2_lookup_by_inum()	2011-01-18 14:49:08 +00:00
Kconfig
lock_dlm.c	GFS2: Fix glock deallocation race	2011-03-09 10:58:04 +00:00
log.c	GFS2: Update to AIL list locking	2011-03-14 12:40:29 +00:00
log.h
lops.c	GFS2: Update to AIL list locking	2011-03-14 12:40:29 +00:00
lops.h
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw	2011-03-16 08:58:43 -07:00
Makefile
meta_io.c	GFS2: Update to AIL list locking	2011-03-14 12:40:29 +00:00
meta_io.h
ops_fstype.c	GFS2: introduce AIL lock	2011-03-11 11:52:25 +00:00
ops_inode.c	GFS2: Post-VFS scale update for RCU path walk	2011-01-21 09:39:24 +00:00
quota.c	GFS2: quota allows exceeding hard limit	2011-03-09 09:32:44 +00:00
quota.h
recovery.c
recovery.h
rgrp.c	GFS2: deallocation performance patch	2011-02-24 12:13:48 +00:00
rgrp.h	GFS2: deallocation performance patch	2011-02-24 12:13:48 +00:00
super.c	GFS2: remove iopen glocks from cache on failed deletes	2011-01-18 14:28:29 +00:00
super.h
sys.c
sys.h
trace_gfs2.h
trans.c
trans.h
util.c
util.h
xattr.c
xattr.h