Is there some way we can avoid this conflict during the next merge window? Given that this is an API change, it may not be possible. Failing that, what's the best merge strategy; should we try to make sure your change goes first, and then I can defer the ext4 pull request until a little bit later in the merge window? Thanks, - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
