It looks right, except perhaps the RPS code looks like it will cause a
build failure with sysfs disabled, but that has nothing to do with your
changes. I don't see any real conflicts here, just two patches passing
very close to each other.
Thanks for the heads up.