Re: [GIT PULL] x86 fixes

From: Joe Perches
Date: Wed Jun 01 2011 - 02:08:36 EST


On Wed, 2011-06-01 at 08:00 +0200, Ingo Molnar wrote:
> * Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> > On Wed, Jun 1, 2011 at 3:16 AM, Borislav Petkov <bp@xxxxxxxxx> 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



--
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/