~kernel-ppa/ubuntu/+source/linux/+git/unstable:master-next

Last commit made on 2015-04-30
Get this branch:
git clone -b master-next https://git.launchpad.net/~kernel-ppa/ubuntu/+source/linux/+git/unstable
Only Ubuntu Kernel PPA can upload to this branch. If you are Ubuntu Kernel PPA please log in for upload directions.

Branch merges

Branch information

Recent commits

cf021c6... by Tim Gardner

UBUNTU: rebase to v4.0.1

Signed-off-by: Tim Gardner <email address hidden>

ce48884... by Andy Whitcroft

UBUNTU: rebase to v4.0 final

Signed-off-by: Andy Whitcroft <email address hidden>

d7131f4... by Tim Gardner

UBUNTU: rebase to v4.0-rc7

Signed-off-by: Tim Gardner <email address hidden>

4d26ed3... by Andy Whitcroft

UBUNTU: rebase to v4.0-rc6

Signed-off-by: Andy Whitcroft <email address hidden>

a75b213... by Andy Whitcroft

fixup! UBUNTU: info -- add v4.0 reconcilliation

Signed-off-by: Andy Whitcroft <email address hidden>

1d3b0b1... by Andy Whitcroft

UBUNTU: [Config] re-enable apparmor 3.0

Signed-off-by: Andy Whitcroft <email address hidden>

8f929d2... by John Johansen

UBUNTU: SAUCE: (no-up): apparmor: fix mediation of fs unix sockets

Fix for out of tree AppArmor 3 patches.

BugLink: http://bugs.launchpad.net/bugs/1408833

Fix 2 issues around the mediation of file base unix domain sockets.
* Add auditing of deleted/shutdown file based unix domains sockets so
  that the denials can be correctly evalated.
* fix the permission request mask so that it is correct for the
  deleted/shutdown socket case.

Signed-off-by: John Johansen <email address hidden>
Signed-off-by: Leann Ogasawara <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

22954f1... by Andy Whitcroft

UBUNTU: apparmor -- follow change to this_cpu_ptr

Signed-off-by: Andy Whitcroft <email address hidden>

1b4d2b0... by John Johansen

UBUNTU: SAUCE: (no-up) fix: bad unix_addr_fs macro

the unix_addr_fs macro should not check for a leading /, instead it
should be checking for the addr not being an abstract socket addr
(leading \0)

BugLink: http://bugs.launchpad.net/bugs/1390223

Signed-off-by: John Johansen <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

28df41e... by John Johansen

UBUNTU: SAUCE: Revert: fix: only allow a single threaded process to ...

Revert the enforcement of only a single thread tasks using change_onexec.
While this change prevents applications from using change_onexec in
a potentially broken way (it can be done right but the application code
using it needs to be carefully audited), it does restrict historically
allowed behavior. Specifically this change is causes docker to fail, and
needs to be reverted until it can be selectively applied with policy
changes.

BugLink: http://bugs.launchpad.net/bugs/1371310

Signed-off-by: John Johansen <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>