On 12/24/17 12:45 PM, Eric Sandeen wrote: > I could do it on commit if you like (not sure I should get into that > habit...). > > :%s/{ &.*, LAST_CONFLICT/{ NULL, LAST_CONFLICT/g Meh, that affects many follow on patches, but I've already done it, so if you give me the thumbs up I'll go ahead and commit it that way. Thanks, -Eric -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html