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	ext2,3,4: provide simple rcu-walk ACL implementation	2011-01-07 17:50:30 +11:00
acl.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
balloc.c	ext3: Add batched discard support for ext3	2011-01-10 19:03:58 +01:00
bitmap.c
dir.c	ext3: speed up file creates by optimizing rec_len functions	2011-01-10 19:04:07 +01:00
ext3_jbd.c
file.c
fsync.c	block: remove BLKDEV_IFL_WAIT	2010-09-16 20:52:58 +02:00
hash.c
ialloc.c	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
inode.c	ext3: Add more journal error check	2011-01-10 19:04:06 +01:00
ioctl.c	ext3: Add FITRIM handling	2011-01-10 19:04:05 +01:00
Kconfig
Makefile
namei.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-03-16 09:15:43 -07:00
namei.h
resize.c	ext3: Add journal error check in resize.c	2011-01-10 19:04:06 +01:00
super.c	ext3: Copy fs UUID to superblock.	2011-03-15 02:21:45 -04:00
symlink.c
xattr_security.c	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
xattr_trusted.c
xattr_user.c
xattr.c	ext2,ext3,ext4: clarify comment for extN_xattr_set_handle	2011-01-10 12:10:30 -05:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00