• Linus Torvalds's avatar
    Merge branch 'for-linus' of... · 7e688095
    Linus Torvalds authored
    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: (90 commits)
      AppArmor: fix build warnings for non-const use of get_task_cred
      selinux: convert the policy type_attr_map to flex_array
      AppArmor: Enable configuring and building of the AppArmor security module
      TOMOYO: Use pathname specified by policy rather than execve()
      AppArmor: update path_truncate method to latest version
      AppArmor: core policy routines
      AppArmor: policy routines for loading and unpacking policy
      AppArmor: mediation of non file objects
      AppArmor: LSM interface, and security module initialization
      AppArmor: Enable configuring and building of the AppArmor security module
      AppArmor: update Maintainer and Documentation
      AppArmor: functions for domain transitions
      AppArmor: file enforcement routines
      AppArmor: userspace interfaces
      AppArmor: dfa match engine
      AppArmor: contexts used in attaching policy to system objects
      AppArmor: basic auditing infrastructure.
      AppArmor: misc. base functions and defines
      TOMOYO: Update version to 2.3.0
      TOMOYO: Fix quota check.
      ...
    7e688095
fs.h 85.9 KB