Re: Badness on the Warp

From: H. Peter Anvin
Date: Sun Jun 21 2009 - 03:03:31 EST


Frans Pop wrote:
>
> The fact that your bisect ended at a merge essentially means that it is
> invalid. As a merge does not introduce any actual change (unless it
> includes changes to resolve conflicts), it normally cannot be the cause
> of a regression.
>

Sort of. You can have a "bum merge" where code conflicts logically,
even if it isn't visible as a conflict in git. Furthermore, of course,
you can have misresolved actual conflicts.

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