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	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
endian24.h
file.c	remove inode_setattr	2010-08-09 16:47:37 -04:00
inode.c	switch jfs to ->evict_inode()	2010-08-09 16:48:17 -04:00
ioctl.c
jfs_acl.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
jfs_btree.h
jfs_debug.c
jfs_debug.h
jfs_dinode.h
jfs_dmap.c
jfs_dmap.h
jfs_dtree.c
jfs_dtree.h
jfs_extent.c
jfs_extent.h
jfs_filsys.h
jfs_imap.c	list.h: new helper - hlist_add_fake()	2010-10-25 21:24:15 -04:00
jfs_imap.h
jfs_incore.h
jfs_inode.c
jfs_inode.h	switch jfs to ->evict_inode()	2010-08-09 16:48:17 -04:00
jfs_lock.h
jfs_logmgr.c	block: clean up blkdev_get() wrappers and their users	2010-11-13 11:55:18 +01:00
jfs_logmgr.h
jfs_metapage.c
jfs_metapage.h
jfs_mount.c
jfs_superblock.h
jfs_txnmgr.c	new helper: ihold()	2010-10-25 21:26:11 -04:00
jfs_txnmgr.h
jfs_types.h
jfs_umount.c
jfs_unicode.c
jfs_unicode.h
jfs_uniupr.c
jfs_xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
jfs_xtree.c
jfs_xtree.h
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
resize.c
super.c	switch jfs to ->s_d_op, close exportfs races	2011-01-12 20:02:43 -05:00
symlink.c
xattr.c	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00