> So I applied this merge fixup to the merge of the net-next tree today > (and can carry it as necessary): Perfect. And please carry this as we do not plan to solve this conflict. Sam -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html