Quotes of the week: Merge window grumpiness edition

And it doesn't matter one whit if you say something like "Oh, but I use quilt, so it's been tested there, and I just imported a very well tested tree into -git to push it to you". Dammit, even if you use quilt or something else to actually maintain your patch series, I KNOW DAMN WELL THAT YOU DIDN'T TEST THAT SERIES ON TOP OF THE RECENT CRAPPY NFS PULL!

So if you use quilt or something, then import the patch series on top of something STABLE AND SANE. Start off with the released 3.0, that at least doesn't have random pulls that have known compile issues. Use that for testing, and don't send me a re-based patch-series that clearly cannot possibly have been tested in that form, and that was based on a kernel that had ugly problems.

So conflicts aren't "bad" per se. I want to see them, because they're a kind of heads-up for me: while any individual conflict isn't necessarily a problem at all, it's something that I just want to be aware of.

So I am not complaining about - or finding it disturbing - that we had a conflict. It's all par for the course. But I don't want submaintainers to merge the conflicts away.

So quite frankly, I think the patch in this form is totally self-defeating. I'm not pulling something that is supposed to clean things up, but just adds more ugliness in some other place.