1
linux/security/tomoyo
Linus Torvalds 0f2cc4ecd8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  init: Open /dev/console from rootfs
  mqueue: fix typo "failues" -> "failures"
  mqueue: only set error codes if they are really necessary
  mqueue: simplify do_open() error handling
  mqueue: apply mathematics distributivity on mq_bytes calculation
  mqueue: remove unneeded info->messages initialization
  mqueue: fix mq_open() file descriptor leak on user-space processes
  fix race in d_splice_alias()
  set S_DEAD on unlink() and non-directory rename() victims
  vfs: add NOFOLLOW flag to umount(2)
  get rid of ->mnt_parent in tomoyo/realpath
  hppfs can use existing proc_mnt, no need for do_kern_mount() in there
  Mirror MS_KERNMOUNT in ->mnt_flags
  get rid of useless vfsmount_lock use in put_mnt_ns()
  Take vfsmount_lock to fs/internal.h
  get rid of insanity with namespace roots in tomoyo
  take check for new events in namespace (guts of mounts_poll()) to namespace.c
  Don't mess with generic_permission() under ->d_lock in hpfs
  sanitize const/signedness for udf
  nilfs: sanitize const/signedness in dealing with ->d_name.name
  ...

Fix up fairly trivial (famous last words...) conflicts in
drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c
2010-03-04 08:15:33 -08:00
..
common.c TOMOYO: Protect find_task_by_vpid() with RCU. 2010-02-26 09:20:11 +11:00
common.h TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain 2010-02-17 11:37:58 +11:00
domain.c TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain 2010-02-17 11:37:58 +11:00
file.c TOMOYO: Remove __func__ from tomoyo_is_correct_path/domain 2010-02-17 11:37:58 +11:00
gc.c TOMOYO: Use shorter names. 2010-02-16 11:17:16 +11:00
Kconfig Kconfig and Makefile 2009-02-12 15:19:00 +11:00
Makefile TOMOYO: Add garbage collector. 2010-02-15 09:00:24 +11:00
realpath.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2010-03-04 08:15:33 -08:00
tomoyo.c Merge branch 'next' into for-linus 2010-03-01 09:36:31 +11:00