On Fri, 18 Jul 2008, Nigel Cunningham wrote:
> Run gitk to see the history. That tells me that the last merge which
> should work fine is 4e6d158c7ae90a6e01538704565469a8a2e96aed.
It appears to be the one before it; that one produces:
----
CC kernel/power/process.o
kernel/power/process.c: In function ‘thaw_kernel_threads’:
kernel/power/process.c:302: error: ‘FREEZER_KERNEL_THREADS’ undeclared (first use in this function)
kernel/power/process.c:302: error: (Each undeclared identifier is reported only once
kernel/power/process.c:302: error: for each function it appears in.)
make[2]: *** [kernel/power/process.o] Error 1
make[1]: *** [kernel/power] Error 2
make: *** [kernel] Error 2
----
... but now that I know how to find the history, I'll work back one and
get that one. Thanks!
-Kenny, learning GIT one painful command at a time
--
Kenneth R. Crudup Sr. SW Engineer, Scott County Consulting, Los Angeles
O: 3630 S. Sepulveda Blvd. #138, L.A., CA 90034-6809 (888) 454-8181
(text/plain)