Messages in this thread | | | Date | Sat, 11 Feb 2006 15:34:25 -0800 | From | Andrew Morton <> | Subject | Re: 2.6.16-rc2-mm1 |
| |
Martin Hermanowski <lkml@martin.mh57.de> wrote: > > > > > You could try reverting that patch (wget > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc2/2.6.16-rc2-mm1/broken-out/hdaps-convert-to-the-new-platform-device-interface.patch > > ; patch -p1 -R < hdaps-convert-to-the-new-platform-device-interface.patch) or please test next -mm, let us know? > > This fails: > ,----[ patch -p1 -R < ../hdaps-convert-to-the-new-platform-device-interface.patch ] > | patching file drivers/hwmon/hdaps.c > | Hunk #1 succeeded at 37 (offset 1 line). > | Hunk #2 succeeded at 63 (offset 1 line). > | Hunk #3 succeeded at 285 with fuzz 2 (offset 1 line). > | Hunk #4 FAILED at 321. > | Hunk #5 FAILED at 340. > | Hunk #6 succeeded at 474 (offset 1 line). > | Hunk #7 succeeded at 512 (offset 1 line). > | Hunk #8 succeeded at 533 (offset 1 line). > | 2 out of 8 hunks FAILED -- saving rejects to file > | drivers/hwmon/hdaps.c.rej > `---- > > At hunk 4/5, the patch expects `down_trylock' and `up', while > `mutex_trylock' and `mutex_unlock' are used in the actual file, I think.
Yes, one of Greg's patches plays with hdaps too. gregkh-i2c-hwmon-convert-semaphores-to-mutexes.patch. Perhaps reverting that first will get you there.
> I will try next -mm anyway, because although the fsck-errors caused by > ext3_getblocks are not harmful, they make me nervous ;-)
I haven't heard from Mingming, so unless I feel inspired to roll up the sleeves and fix it (P=0.002), that won't be fixed in next -mm.
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |