> I tried applying this, but got some conflict. I guess you have based
> this on some of the other series that's in the pipe. Maybe you can
> give me some advice about the order or how to apply things?

Sorry, this depends on the stalled SCC patchset and I need to send a
second version of that (hopefully next week). Should have mentioned it
here, mea culpa! So, this needs to wait a little.