On Thu, Mar 17, 2011 at 11:06:17PM +0000, Richard Senior wrote: > > 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) > ### Ok, then do: git checkout arch/x86/kernel/entry_64.S which will restore the version of that file to the one before you edited it, and then git bisect should be able to continue. hope this helps, greg k-h -- 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
