I think you included one patch too many in your series, this was already applied. Btw, if you have this in a git tree making that available would ease testing a bit.