On Wed, Oct 16, 2013 at 10:06:45PM +0200, Peter Zijlstra wrote: > 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?!
FWIW, commit 1ab2460 came in through Neil's md tree. Thierry
pgpc3B_zbiMlP.pgp
Description: PGP signature
