Re: [bisected][mismerge?] Re: [microcode] 2.6.23.git pulled thismorning oopses loading P4 microcode

[Randy Dunlap]

On Fri, 19 Oct 2007 12:18:19 +0200 Mike Galbraith wrote:

> On Fri, 2007-10-19 at 04:49 +0200, Mike Galbraith wrote: 
> > On Thu, 2007-10-18 at 23:33 +0100, Samuel Thibault wrote:
> > > Hi,
> > > 
> > > Mike Galbraith, le Thu 18 Oct 2007 19:56:38 +0200, a écrit :
> > > > The winner of a very long git bisect session:
> > > > 
> > > >     unicode diacritics support
> > > 
> > > Uh, I fail to see how that could have an impact, I've again checked the
> > > boundaries, it looks fine, please people have a look.
> > 
> > I too was reluctant to believe the bisect result.  But...
> 
> Weeeell now, that skepticism is indeed well founded.  It's dontdiff.  A
> diff of trees where defkeymap.c_shipped has been modified produces no
> output.  Once a working tree has been afflicted by using diff+dontdiff
> to update it, even overwriting the entire tree via git-archive doesn't
> lead to a good build unless you also touch defkeymap.c_shipped
> afterward.  In my case, the working tree remained buildable yet
> thoroughly busted through a lengthy bisect and beyond.  That bisect
> positively identified... the victim.
> 
> poo.

Yes, that's bad.  Sam has asked me to fix some dontdiff problems.
I'll try to get to it soon.  Other people can also update it....


---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/