On Wed, Oct 16, 2013 at 08:51:39PM +0200, Thierry Reding wrote: > Today's linux-next merge of the tip tree got a conflict in > > include/linux/wait.h > > caused by commits 1ab2460 (wait: add wait_event_cmd()) and fb869b6 > (sched/wait: Clean up wait.h details a bit). Gargh, where did that come from?! -- 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
