On Wed, Nov 30, 2011 at 11:10:01AM +0200, Felipe Balbi wrote: > On Wed, Nov 30, 2011 at 08:01:26AM +0900, Greg KH wrote: > > Linus will complain if you have unneeded merges, and your branch had a > > totally unneeded, and not really documented at all, merge at the end of > > it to my tree. > I wouldn't say it's unneded, it was the commit which brought our > histories together. Undocumented maybe, but then again, what's there to > document after all? Clearly someone is going to have do the merge, the point is that this should be done as part of pulling the changes rather than the person sending the pull request. This gives the person doing the pull more visibility of what's going on and in general there's going to have to be a further merge anyway as a result of other changes in the master tree. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
