From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
pasky@suse.cz, Alan.Brunelle@hp.com,
linux-kernel@vger.kernel.org, git@vger.kernel.org
Subject: Re: Linux 2.6.27-rc3: kernel BUG at mm/vmalloc.c - bisected
Date: Fri, 22 Aug 2008 23:36:18 +0200 [thread overview]
Message-ID: <20080822213618.GC1598@atjola.homenet> (raw)
In-Reply-To: <20080822141651.fe16ed99.akpm@linux-foundation.org>
On 2008.08.22 14:16:51 -0700, Andrew Morton wrote:
> It's pretty simple. If git-bisect tells us that the regression was
> introduced by a merge commit, we want to perform a bisection within
> that merge's individual commits.
bisect already did that. It asked for the left side and the right side,
both were good. What you can still do is creating a _new_ history where
the commits are not in parallel but linearized, like Jeff described. But
that's (in general) not a trivial task as you need to reapply individual
commit patches which can cause conflicts that were already solved in the
existing merges to show up again. Or, it can even produce new conflicts,
for example when a commit on one side was reverted before the merge
happened. In that case, you get into a state with changes that were
never visible before.
Björn
prev parent reply other threads:[~2008-08-22 21:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <48A36838.3050309@hp.com>
[not found] ` <20080819124602.9e8e69f7.akpm@linux-foundation.org>
[not found] ` <48AEDD3D.4060507@hp.com>
2008-08-22 16:25 ` Linux 2.6.27-rc3: kernel BUG at mm/vmalloc.c - bisected Andrew Morton
2008-08-22 17:16 ` Petr Baudis
2008-08-22 17:51 ` Andrew Morton
2008-08-22 18:07 ` Alan D. Brunelle
2008-08-22 19:37 ` Björn Steinbrink
2008-08-22 19:47 ` Alan D. Brunelle
2008-08-22 20:17 ` Alan D. Brunelle
2008-08-22 19:48 ` Jeff King
2008-08-22 21:05 ` Junio C Hamano
2008-08-22 21:16 ` Andrew Morton
2008-08-22 21:21 ` Jeff King
2008-08-22 21:36 ` Björn Steinbrink [this message]
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=20080822213618.GC1598@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=Alan.Brunelle@hp.com \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pasky@suse.cz \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox