On Mon, May 16, 2016 at 05:59:50PM +0200, Jan Kara wrote: > The patch which fixes ext4 behavior is attached. Just that we know what we > are speaking about... Rebasing all the patches on top of this is trivial > (git rebase just handles the conflict automatically). OK, I've added this one-liner to the ext4 tree. I presume that if git rebase handles the conflict automatically, git merge should be able to handle automatically it as well. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
