]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'more-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Dec 2012 16:39:57 +0000 (08:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Dec 2012 16:39:57 +0000 (08:39 -0800)
commitd91fa971285a3ac33b4e8af6cea7c455543e2599
treeda1a1f2f79f5526df5a1674e67bc31e84c8e954c
parent54d1ae492f724f103a07f69c8e429a35d43b5c52
parent527897ccd968c86ad3265d62962c8beccdb94e47
Merge branch 'more-fixes' of git://git./linux/kernel/git/rusty/linux

Pull build fix from Rusty Russell:
 "Tim Gardner <tim.gardner@canonical.com> writes:
  > It is $(obj)/oid_registry.o that is dependent on $(obj)/oid_registry_data.c.
  > The object file cannot be built until $(obj)/oid_registry_data.c has been
  > generated.
  >
  > A periodic and hard to reproduce parallel build failure is due to
  > this incorrect lib/Makefile dependency. The compile error is completely
  > disingenuous.
  >
  >   GEN     lib/oid_registry_data.c
  > Compiling 49 OIDs
  >   CC      lib/oid_registry.o
  > gcc: error: lib/oid_registry.c: No such file or directory
  > gcc: fatal error: no input files
  > compilation terminated.
  > make[3]: *** [lib/oid_registry.o] Error 4

  I can't reproduce it either.  It's completely weird; nothing ever
  removes lib/oid_registry.c, so either gcc is giving the wrong message
  or it's a weird fs with a very odd race.

  But your version is definitely more correct than the previous one,
  so..."

* 'more-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  lib/Makefile: Fix oid_registry build dependency