Quick experiment to gauge the likelihood of conflicts: I reran coccinelle on v1.7.0, then attempted to merge the result into master. I got *two* conflicts. I backed out with "git-merge --abort", then merged with "git-merge -s recursive -X ours g_new.old" to drop both conflicting hunks, and the result is just fine.
Peter, would you be willing to honor a pull request?
