On Wed, Jul 25, 2012 at 3:58 PM, Jeff Garzik <jgarzik@xxxxxxxxx> wrote: > > What is the right course in when a post-merge change is needed? Just describe the issue and the required change. Than I can just do it as part of the merge, and now the whole series is bisectable, including the merge itself. Here's a (fairly bad) example: http://www.spinics.net/lists/netdev/msg192349.html and the reason I call that a bad example is not because that's a bad pull request, but simply that those are all real data conflicts, not the more subtle kind of "it merges fine, but because new code introduced uses an interface that changed, you need to do xyz". I couldn't find an example of that in a quick look, it's fairly uncommon to have non-conflicting merges that had semantic - but not contextual - conflicts. (Although it does happen, and sometimes it's actually not the developer, but Stephen Rothwell who notices it in -next and lets me know before the merge). Linus -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
