On Wed, Oct 16, 2013 at 10:14:10PM +0200, Peter Zijlstra wrote: > 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. Mark and I use this repository as a temporary location: git://gitorious.org/thierryreding/linux-next.git If we ever decide to do this again when Stephen's on vacation, we should try to get shared access setup for the kernel.org repository. Providing temporary service was a spontaneous decision, so we didn't prepare very well. Sorry for the inconvenience. Thierry
Attachment:
pgpUkQmp7u8ol.pgp
Description: PGP signature
