Skip to contentSkip to conversation

git pull breaks edosk7760 kernel

DISCUSSION Luca Santini 3 participants 4 messages Nov 22, 2008 – Nov 24, 2008 SuperH

lore
Share & tools
lore

Luca Santini

author
#0 lore raw

Hi all,
yesterday i pulled from git and obtained an unbootable kernel. My last working pull is dated

commit 882b689432129bfe77530d61f70797147179a742
Merge: b86c2c0... fb059cd...
Author: Luca Santini <[email protected]>
Date: Thu Nov 13 11:31:54 2008 +0100

The only thing i was able to do is
git reset --hard HEAD^

i'm not a god of git... is there a way to "pull step by step" and find the offending patch(es)?

#1 lore raw
Quoted 10 lines · Luca Santini

Hi all,
yesterday i pulled from git and obtained an unbootable kernel. My last working pull is dated

commit 882b689432129bfe77530d61f70797147179a742
Merge: b86c2c0... fb059cd...
Author: Luca Santini <[email protected]>
Date: Thu Nov 13 11:31:54 2008 +0100

Quoted 4 lines

The only thing i was able to do is git reset --hard HEAD^

i'm not a god of git... is there a way to "pull step by step" and find the offending patch(es)? --

The usual way to find the commit that introduced a bug is via git-bisect.

Checkout http://www.kernel.org/doc/local/git-quick.html#bisect

author
#2 lore raw
In reply to Luca Santini

Thanks Matt,
i tried to use git-bisect, and i hope i used it fine; this is my final output:

406f9e9cfe5d44fbcdc6e8f4b1f205e1160c0fef is first bad commit commit 406f9e9cfe5d44fbcdc6e8f4b1f205e1160c0fef

Author: Paul Mundt <[email protected]>
Date:   Tue Nov 18 14:22:39 2008 +0900

sh: __udivdi3 -> do_div() in softfloat lib.

Inhibit the generation of __udivdi3 for the softfloat lib, use do_div() outright.

Signed-off-by Paul Mundt <[email protected]>

:040000 040000 70142433e2ab902b50182ea127ea1e56803dac87 7801a0a6ef1e2d6703f82fa82587ba03fe140048 M arch

...and now?

Quoted 21 lines · Matt Fleming
Quoted 10 lines · Luca Santini

Hi all,
yesterday i pulled from git and obtained an unbootable kernel. My last working pull is dated

commit 882b689432129bfe77530d61f70797147179a742
Merge: b86c2c0... fb059cd...
Author: Luca Santini <[email protected]>
Date: Thu Nov 13 11:31:54 2008 +0100

Quoted 4 lines

The only thing i was able to do is git reset --hard HEAD^

i'm not a god of git... is there a way to "pull step by step" and find the offending patch(es)? --

The usual way to find the commit that introduced a bug is via git-bisect.

Checkout http://www.kernel.org/doc/local/git-quick.html#bisect

#3 lore raw
In reply to Luca Santini
Quoted 18 lines · Luca Santini

Thanks Matt,
i tried to use git-bisect, and i hope i used it fine; this is my final output:

406f9e9cfe5d44fbcdc6e8f4b1f205e1160c0fef is first bad commit commit 406f9e9cfe5d44fbcdc6e8f4b1f205e1160c0fef

Author: Paul Mundt <[email protected]>
Date:   Tue Nov 18 14:22:39 2008 +0900

sh: __udivdi3 -> do_div() in softfloat lib.
Inhibit the generation of __udivdi3 for the softfloat lib, use
do_div()
outright.

Signed-off-by Paul Mundt <[email protected]>
Quoted 8 lines

:040000 040000 70142433e2ab902b50182ea127ea1e56803dac87
7801a0a6ef1e2d6703f82fa82587ba03fe140048 M arch

...and now?

Reverting this fixes your kernel? I'll take another look at it and see if I broke something accidentally. Note that now there are also __udivdi3 implementations in the kernel, so I wonder if your compiler is clashing with those.