~ubuntu-kernel/ubuntu/+source/linux/+git/utopic:manta

Last commit made on 2014-09-20
Get this branch:
git clone -b manta https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/utopic
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

6ab48f7... by Tim Gardner

UBUNTU: Ubuntu-manta-3.4.0-6.29

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

94104c6... by John Johansen

UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot

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 manta kernel
- apparmor: backport setup base backport files
- apparmor: 3.15 backport revert nick kvfree() from apparmor
- apparmor: 3.12 backport mtd: Move major number f83c3838
- apparmor: 3.11 backport revert module/lsm: Have apparm 5265fc62
- apparmor: 3.10 backport revert no delay vfree()
- apparmor: 3.8 backport provide file_inode helper 496ad9aa
- apparmor: 3.6 backport revert uapi for capnames 43c422ed
- apparmor: 3.6 backport revert uapi for resnames 8a1ab315
- apparmor: 3.6 backport define kuid_t d2b31ca64
- apparmor: 3.6 backport kuid_t support for audit 2db81452
- apparmor: 3.6 backport remove const from sb_mount 808d4e3c
- apparmor: 3.6 backport provide iterate_fd c3c073f8
- apparmor: 3.6 backport provide replace_fd 8280d161
- apparmor: 3.5 backport dentry_open params 765927b2
- apparmor: 3.4 backport revert file_mmap e5467859
- apparmor: 3.4 backport cap_mmap_addr d007794a
- apparmor: 3.4 backport alias file_open 83d49856

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

Signed-off-by: John Johansen <email address hidden>
Signed-off-by: Tyler Hicks <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

94da4ad... by Tim Gardner

Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 6 snapshot"

This reverts commit 6a2a0ea3424e553caad17e38e6477f6059a91862.

c34f039... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor spams log with warning message"

This reverts commit 4921af6dca20554e3e822cec0a1e6c01bc4314fe.

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

0ea6294... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix refcount bug in apparmor pivotroot"

This reverts commit 845b296af26ca48f2a17d969d43c94ece93d70c1.

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

f5cc7ec... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor refcount bug in apparmor_kill"

This reverts commit c4629eb28f46a79b0101217d866ea412f6a4d36f.

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

42142e2... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix bug that constantly spam the console"

This reverts commit dcbf9136c854827b965474787959f5914ab68cdf.

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

c928cc8... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: use custom write_is_locked macro"

This reverts commit 318b13be3b658e7f1461633d0ad91921d44639d7.

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

2dd5538... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor fix: remove unused cxt var for unix_sendmsg"

This reverts commit cd1cab56ab33eadc15ebb9e4e85e96ecd2f68dd9.

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

8253968... by Tyler Hicks

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix disconnected bind mnts reconnection"

This reverts commit a85d3de7fb44831d4913ae8172343cca244f63ff.

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