Re: [GIT PULL] x86 trampoline rework for 3.5

[H. Peter Anvin]

On 05/29/2012 08:19 PM, Linus Torvalds wrote:
> 
> I didn't see any git silent mis-merges, though. The fact that that
> relocs.c file had come in two different ways did make for a more
> interesting merge, since it didn't have any common ancestry - just two
> different original versions. But git seemed to do the right thing, and
> marked where they differed.
> 

I don't know why, but when I did a test merge of my original branch into
top of your tree, it silently merged everything (no markings) but
incorrectly.

Perhaps it is a git version-specific thing.

	-hpa


-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

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