Messages in this thread | | | Subject | Re: [GIT PULL] x86 fixes | From | Joe Perches <> | Date | Tue, 31 May 2011 23:08:30 -0700 |
| |
On Wed, 2011-06-01 at 08:00 +0200, Ingo Molnar wrote: > * Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Wed, Jun 1, 2011 at 3:16 AM, Borislav Petkov <bp@amd64.org> wrote: > > > Crap, there's no fixing this string :) > > I tried to fix it up in the merge. We call these "evil merges" in > > git-speak, but I hope the problem was worth doing one ;) > You have not pushed it out yet, right? [ Or if you have then the > evilness is well hidden! :-) ]
I'd never noticed one of these before and had to look myself.
git show af0d6a0a3a30946f7df69c764791f1b0643f7cd6
| |