Please either set your text editor not to remove trailing spaces or use diff -w. Whitespace changes make it harder to merge the patch. It is upstream's job to clean up their whitespace, not ours. :-)