> On Tue, 2011-03-15 at 13:48 -0700, Greg KH wrote:
>
> > Any chance you can run 'git bisect' ...
I've got most of the way through the git bisect but I've hit a problem
and would appreciate some advice. I don't want to waste all the work
I've done on this so far with a false move at this stage.
My latest test was a bad one, so I issued a git bisect bad:
###
$ git bisect bad
Bisecting: 3 revisions left to test after this (roughly 2 steps)
error: Your local changes to the following files would be overwritten by
checkout:
arch/x86/kernel/entry_64.S
Please, commit your changes or stash them before you can switch
branches.
Aborting
###
I've not made any changes of my own, but I did have to apply a patch
(based on Googling an error message) to get the first compilation to
work:
###
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 44a99bb..3571494 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1270,7 +1270,7 @@ ENTRY(xen_do_hypervisor_callback) #
do_hypervisor_callback(struct *pt_regs)
decl PER_CPU_VAR(irq_count)
jmp error_exit
CFI_ENDPROC
-END(do_hypervisor_callback)
+END(xen_do_hypervisor_callback)
###
This is my current output from git bisect log:
###
git bisect start
# bad: [c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470] Linux 2.6.38-rc1
git bisect bad c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470
# good: [3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5] Linux 2.6.37
git bisect good 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
# bad: [ecacc6c70cf77a52a22af66c879873202522d6ce] Merge branch 'release'
of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
git bisect bad ecacc6c70cf77a52a22af66c879873202522d6ce
# good: [f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234] Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
git bisect good f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234
# good: [f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234] Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
git bisect good f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234
# good: [aa58abc20fa85328a9f048e2626c0893691ff284] input/tc3589x: fix
compile error
git bisect good aa58abc20fa85328a9f048e2626c0893691ff284
# good: [fb5131e1880ea1ba3ba7197cd5cc66c9c288f715] Merge branch
'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
git bisect good fb5131e1880ea1ba3ba7197cd5cc66c9c288f715
# good: [78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252] Merge branch
'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
git bisect good 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252
# bad: [9f99a2f0e44663517b99b69a3e4a499d0ba877df] Merge branch
'stable/bug-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
git bisect bad 9f99a2f0e44663517b99b69a3e4a499d0ba877df
# good: [1542dec1c9109fdcd1c53460f064096f24fc49d2] Merge branch
'upstream-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
git bisect good 1542dec1c9109fdcd1c53460f064096f24fc49d2
# good: [f28b1c8aaa97a68028bb894bffb1690185c62b01] Merge branch
'kconfig' of
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
git bisect good f28b1c8aaa97a68028bb894bffb1690185c62b01
# good: [e3166331a3288dd7184548896a1c7ab682f0dbe8] Merge branch 'misc'
of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
git bisect good e3166331a3288dd7184548896a1c7ab682f0dbe8
# bad: [a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9] Merge branch
'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
git bisect bad a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9
###
--
Regards,
Richard
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
