I may have hashed this out with davej only in private before, so perhaps
you aren't aware of the normal plan for utrace updates. You disabled
utrace when you should have just run ./scripts/pull-upstreams.sh to get the
current patch set. The 2008-1-3 version of the patches already applied
fine. (I just regenerated for 2.6.24-rc7 but there were in fact zero
changes to the patch files vs the files already up on 2008-1-3.)
Thanks,
Roland