git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Linux 2.6.27-rc3: kernel BUG at mm/vmalloc.c - bisected

From
Jeff King <peff@peff.net>
Date
Aug 22, 2008, 19:48 UTC
Message-ID
<20080822194846.GA31356@coredump.intra.peff.net>
In-Reply-To
<20080822193730.GA1598@atjola.homenet>
On Fri, Aug 22, 2008 at 09:37:30PM +0200, Björn Steinbrink wrote:
Show 12 quoted lines
> Yep, and that's totally correct as far as bisect is concerned. The
> parents of that merge commit are:
> 88fa08f67bee1a0c765237bdac106a32872f57d2
> b1b135c8d619cb2c7045d6ee4e48375882518bb5
> 
> And Alan marked both of them as good.
> 
> So, unless Alan made a mistake during his bisection, each of the
> branches is correct, but the merge did not lead to a correct result. So
> while there were no textual conflicts, there were still incompatible
> changes regarding the code semantics and compatibility was not restored
> during the merge.

One thing that I have seen proposed (but never tried myself) is that you can linearize the changes using "rebase -i" (or cherry-picking), and then bisect that result. That is, given a history

A-B-C-D
 \   /
  E-F
where the merge "D" introduces the bug, you could try creating:
  A-B-C-E'-F'

and bisecting that. And you should know that C is good from your previous bisection, but that F' probably is not, since it should be textually the same as D (unless, of course, you had textual conflicts during the rebase that you fixed up differently).

So in essence you are testing each of E and F, but based on the other work. So you should be able to find the one patch that causes the conflict. And depending on the conflict, you may get more information by doing it the other way. I.e.,:

  A-E-F-B'-C'
-Peff
Previous: Alan D. BrunelleNext: Junio C Hamano
Message 8 of 12 in “Re: Linux 2.6.27-rc3: kernel BUG at mm/vmalloc.c - bisected”
  1. Andrew MortonAug 22, 2008
  2. Petr BaudisAug 22, 2008
  3. Andrew MortonAug 22, 2008
  4. Alan D. BrunelleAug 22, 2008
  5. Björn SteinbrinkAug 22, 2008
  6. Alan D. BrunelleAug 22, 2008
  7. Alan D. BrunelleAug 22, 2008
  8. Jeff KingAug 22, 2008
  9. Junio C HamanoAug 22, 2008
  10. Andrew MortonAug 22, 2008
  11. Jeff KingAug 22, 2008
  12. Björn SteinbrinkAug 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.