All of lore.kernel.org
 help / color / mirror / Atom feed
From: "H. Peter Anvin" <hpa@zytor.com>
To: Frans Pop <elendil@planet.nl>
Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org,
	Sean MacLennan <smaclennan@pikatech.com>
Subject: Re: Badness on the Warp
Date: Sun, 21 Jun 2009 00:03:03 -0700	[thread overview]
Message-ID: <4A3DDB27.2000500@zytor.com> (raw)
In-Reply-To: <200906202256.46073.elendil@planet.nl>

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.

WARNING: multiple messages have this Message-ID (diff)
From: "H. Peter Anvin" <hpa@zytor.com>
To: Frans Pop <elendil@planet.nl>
Cc: Sean MacLennan <smaclennan@pikatech.com>,
	linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: Badness on the Warp
Date: Sun, 21 Jun 2009 00:03:03 -0700	[thread overview]
Message-ID: <4A3DDB27.2000500@zytor.com> (raw)
In-Reply-To: <200906202256.46073.elendil@planet.nl>

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.


  parent reply	other threads:[~2009-06-21  7:26 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-20 19:48 Badness on the Warp Sean MacLennan
2009-06-20 20:56 ` Frans Pop
2009-06-20 20:56   ` Frans Pop
2009-06-20 23:10   ` Sean MacLennan
2009-06-20 23:26     ` Frans Pop
2009-06-21  4:08       ` Daniel Barkalow
2009-06-21  4:08         ` Daniel Barkalow
2009-06-20 23:42   ` Sean MacLennan
2009-06-21  4:28     ` Frans Pop
2009-06-21  4:28       ` Frans Pop
2009-06-21 10:20       ` Pekka Enberg
2009-06-21 10:20         ` Pekka Enberg
2009-06-21 22:25         ` Benjamin Herrenschmidt
2009-06-21 22:25           ` Benjamin Herrenschmidt
2009-06-21 22:36           ` Sean MacLennan
2009-06-21 22:36             ` Sean MacLennan
2009-06-21 22:57             ` Benjamin Herrenschmidt
2009-06-21 22:57               ` Benjamin Herrenschmidt
2009-06-22  4:48             ` Pekka Enberg
2009-06-22  4:48               ` Pekka Enberg
2009-06-23  5:24           ` Sean MacLennan
2009-06-23  5:24             ` Sean MacLennan
2009-06-21  7:03   ` H. Peter Anvin [this message]
2009-06-21  7:03     ` H. Peter Anvin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A3DDB27.2000500@zytor.com \
    --to=hpa@zytor.com \
    --cc=elendil@planet.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=smaclennan@pikatech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.