Comment 19 for bug 1464560

Ok so I'll push the vivid(3.19) SRU out first, but for utopic(3.16) I think a bit more help is required. In order to prepare to cherry-pick d800ba1 (since it is moving a bunch of code into a new file), I wanted to be sure not to lose any of the other cherry-picked features we added. So I came up with the following patches needed before-hand (which adds other features... and makes me a bit nervous):

6d626c5e
5b642340
d9df1b5d
d1a85eee
1212aa1c
16b1d26e

However even with that when I cherry-pick the rest of the series, I get a ton of conflicts.

Any advice would be helpful here, I don't want to lose any features we have in 3.16, nor cause regression. We don't require clean cherry-picks, but I'd like to make things as easy as possible for future cherry-picks and fixes.

Our current utopic tree is here (branch master-next for the latest):
http://kernel.ubuntu.com/git/ubuntu/ubuntu-utopic.git/