Re: 2.6.35 suspend regression (bisected)

From: Roberto Oppedisano
Date: Tue Jul 27 2010 - 15:52:35 EST


On 27/07/2010 21:03, Rafael J. Wysocki wrote:
I did bisect again and I did get a different result:

c1518f12bab97a6d409a25aaccb02dc8895800f3 is the first bad commit

Trying to revert that commit gives:

$ git bisect reset
$ git revert c1518f12bab97a6d409a25aaccb02dc8895800f3
fatal: Commit c1518f12bab97a6d409a25aaccb02dc8895800f3 is a merge but no
-m option was given.

How am I supposed to proceed now ? (sorry I'm a git newbie)
The bisect turned up a merge, which means it probably didn't really converge
for you.

Do you use a camera driver?
Yes, this laptop has an integrated webcam.

Bus 001 Device 004: ID 04f2:b059 Chicony Electronics Co., Ltd


which i think is driven by uvcvideo.ko. I've tryed to rmmod uvcvideo, videodev and

v4l1_compat but on current git suspend still hangs in the same way (screen black,
backlight on, fans at full speed, no response to ping and... nothing in the logs).


R


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