I feel like you need to break the patch up a bit and do the white space fixes separate from the other changes. (Probably you're going to have to redo this several times because it's hard to review when it's so mixed up with multiple changes at the same time). regards, dan carpenter