What I don't see in this patch-set is removal of the current rt_avgstuff.And I didn't look closely enough; but are the root cfs and rt peltwindows aligned? They really should be; otherwise you can't combine themsanely.