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?! Also, wth does that live? # git show 1ab2460 fatal: ambiguous argument '1ab2460': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' # git remote show next * remote next Fetch URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git And I made sure to update the remote. -- 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
