Re: [GIT PULL] x86 fixes

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxx> 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! :-) ]

Oh, you did push it out, i just forgot to merge it in :)

I don't think it's a truly evil merge if it's declared in the merge 
commit log - but yeah, it's outside the scope given by the two trees 
so technically it's evil :)

Thanks,

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