Erik Faye-Lund <kusmabite@xxxxxxxxx> writes: > I supposed the correct conflict-resolution would be to keep Markus' > new conditional inclusion, but move it to the location I changed it > to. With this patch on top it compiles just fine for me: Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html