Start merging changes with ip_gre.c