1287fc5333
This is a sync and squash to the apparmor 3 RC 1 development snapshot. The set of patches in this squash are available at the apparmor-3.RC1 tag in git://kernel.ubuntu.com/jj/ubuntu-utopic.git. This cleans up several functions over the alpha6 sync, and includes multiple bug fixes. In addition it picks up - new network mediation - fine grained mediation of all unix socket types In addition to the apparmor 3 RC 1 sync this contains the backport patch series for the 3.4 goldfish kernel - apparmor: 3.4 backport alias file_open 83d49856 - apparmor: 3.4 backport fake no_new_privs 259e5e6c - apparmor: 3.4 backport cap_mmap_addr d007794a - apparmor: 3.4 backport revert file_mmap e5467859 - apparmor: 3.5 backport dentry_open params 765927b2 - apparmor: 3.6 backport provide replace_fd 8280d161 - apparmor: 3.6 backport provide iterate_fd c3c073f8 - apparmor: 3.6 backport remove const from sb_mount 808d4e3c - apparmor: 3.6 backport kuid_t support for audit 2db81452 - apparmor: 3.6 backport define kuid_t d2b31ca64 - apparmor: 3.6 backport revert uapi for resnames 8a1ab315 - apparmor: 3.6 backport revert uapi for capnames 43c422ed - apparmor: 3.8 backport provide file_inode helper 496ad9aa - apparmor: 3.10 backport revert no delay vfree() - apparmor: 3.11 backport revert module/lsm: Have apparm 5265fc62 - apparmor: 3.12 backport mtd: Move major number f83c3838 - apparmor: 3.15 backport revert nick kvfree() from apparmor - apparmor: backport setup base backport files BugLink: http://bugs.launchpad.net/bugs/1362199 Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>