[pull-request][utopic][manta] - aa3 alpha 6 sync

[John Johansen]

The following changes since commit 83cfb65cfdf0a59155c618bcf867289caddc6de2:

  ARM: 7809/1: perf: fix event validation for software group leaders (2014-06-26 21:07:59 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-utopic.git manta-aa3-backport

for you to fetch changes up to e85f9c4f09bf9a7814bb56cbf1904d9d22cb185d:

  UBUNTU: SAUCE: (no-up) apparmor: fix disconnected bind mnts reconnection (2014-06-27 02:52:27 -0400)

----------------------------------------------------------------
Javier Martinez Canillas (1):
      UBUNTU: SAUCE: (no-up) apparmor: fix bug that constantly spam the console

John Johansen (16):
      Revert "UBUNTU: SAUCE: apparmor: removing extra code block that was probably added by a conflict"
      Revert "UBUNTU: SAUCE: apparmor: removing define as it's currently defined"
      Revert "UBUNTU: SAUCE: apparmor: fix bad lock balance when introspecting policy"
      Revert "UBUNTU: SAUCE: apparmor: fix memleak of replacedby struct"
      Revert "UBUNTU: SAUCE: apparmor: fix memleak of the profile hash"
      Revert "UBUNTU: SAUCE: apparmor: allocate path lookup buffers during init"
      Revert "UBUNTU: SAUCE: apparmor: fix unix domain sockets to be mediated on connection"
      Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot"
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 6 snapshot
      UBUNTU: SAUCE: (no-up) apparmor: update configs for apparmor 3 alpha 6
      UBUNTU: SAUCE: (no-up) apparmor: fix apparmor spams log with warning message
      UBUNTU: SAUCE: (no-up) apparmor: fix refcount bug in apparmor pivotroot
      UBUNTU: SAUCE: (no-up) apparmor: fix apparmor refcount bug in apparmor_kill
      UBUNTU: SAUCE: (no-up) apparmor: use custom write_is_locked macro
      UBUNTU: SAUCE: (no-up) apparmor fix: remove unused cxt var for unix_sendmsg
      UBUNTU: SAUCE: (no-up) apparmor: fix disconnected bind mnts reconnection

 debian.manta/config/config.common.ubuntu |   2 +-
 security/apparmor/.gitignore             |   1 +
 security/apparmor/Makefile               |   2 +-
 security/apparmor/apparmorfs.c           |  79 +++-
 security/apparmor/audit.c                |  27 +-
 security/apparmor/backport.c             | 138 +++++++
 security/apparmor/capability.c           |  57 +--
 security/apparmor/context.c              |   2 +-
 security/apparmor/crypto.c               |  34 +-
 security/apparmor/domain.c               |  80 ++--
 security/apparmor/file.c                 | 509 +++++++++++++++--------
 security/apparmor/include/apparmor.h     |  19 +-
 security/apparmor/include/apparmorfs.h   |   2 +
 security/apparmor/include/audit.h        |  61 ++-
 security/apparmor/include/backport.h     |  34 +-
 security/apparmor/include/capability.h   |   9 +-
 security/apparmor/include/context.h      |  44 +-
 security/apparmor/include/file.h         |  78 +++-
 security/apparmor/include/ipc.h          |  22 +-
 security/apparmor/include/label.h        | 107 ++++-
 security/apparmor/include/match.h        |  15 +
 security/apparmor/include/mount.h        |   2 +-
 security/apparmor/include/path.h         |  14 +-
 security/apparmor/include/perms.h        | 170 ++++++++
 security/apparmor/include/policy.h       |   3 +-
 security/apparmor/include/sig_names.h    |  95 +++++
 security/apparmor/ipc.c                  | 249 ++++++++----
 security/apparmor/label.c                | 673 ++++++++++++++++++++++++++-----
 security/apparmor/lib.c                  | 258 +++++++++++-
 security/apparmor/lsm.c                  | 321 ++++++++-------
 security/apparmor/mount.c                | 313 +++++++-------
 security/apparmor/net.c                  |  74 ++--
 security/apparmor/path.c                 |  44 +-
 security/apparmor/policy.c               |  39 +-
 security/apparmor/policy_unpack.c        |  58 +--
 security/apparmor/procattr.c             |   9 +-
 security/apparmor/resource.c             |  66 +--
 37 files changed, 2681 insertions(+), 1029 deletions(-)
 create mode 100644 security/apparmor/backport.c
 create mode 100644 security/apparmor/include/perms.h
 create mode 100644 security/apparmor/include/sig_names.h