Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

* '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
  ...

diff --cc arch/x86/Kconfig
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ext3/namei.c
Simple merge

diff --cc fs/file_table.c
Simple merge

diff --cc fs/jfs/namei.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc fs/reiserfs/namei.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/security.c
Simple merge