Hi, if the patch is not applying you have to modify it. Even if the two .rej files are corrected, its not likely to work, because you also have many "fuzzy" succeeded lines. you have just to decide.. - drop the mm patches - drop the thinkpad patches - find someone how is able and willing to rebase thinkpad-acpi to one of the mm patches On Sun, 04 Nov 2007, Jonny Gerold wrote: > Hello > I'm getting a bunch of errors when trying to patch the thinkpad_acpi > with 2.6.23.1mm... > I also attached the .c.rej file, the .c .h .h.rej, and I'm trying to > patch it with this command: > > patch -Np1 -i ../thinkpad-acpi-v2.6.23.1.patch || return 1 > > If any of you are familiar with archlinux then I attached the PKGBUILD > as well. > > Here's the errors: > > patching file Documentation/thinkpad-acpi.txt > Hunk #2 FAILED at 105. > Hunk #3 succeeded at 236 (offset 5 lines). > Hunk #5 FAILED at 813. > Hunk #6 succeeded at 970 (offset 5 lines). > Hunk #8 succeeded at 1023 (offset 5 lines). > Hunk #9 FAILED at 1058. > Hunk #10 FAILED at 1202. > Hunk #11 FAILED at 1304. > 5 out of 11 hunks FAILED -- saving rejects to file > Documentation/thinkpad-acpi.txt.rej > patching file drivers/misc/Kconfig > Hunk #1 succeeded at 219 with fuzz 2 (offset 17 lines). > patching file drivers/misc/thinkpad_acpi.c > Hunk #1 FAILED at 21. > Hunk #2 succeeded at 123 with fuzz 2 (offset 6 lines). > Hunk #3 succeeded at 351 with fuzz 2 (offset 3 lines). > Hunk #4 FAILED at 529. > Hunk #5 succeeded at 539 with fuzz 2 (offset -15 lines). > Hunk #6 FAILED at 694. > Hunk #7 succeeded at 807 (offset 34 lines). > Hunk #8 succeeded at 847 (offset -15 lines). > Hunk #9 succeeded at 1272 (offset 34 lines). > Hunk #10 succeeded at 1242 (offset -15 lines). > Hunk #11 succeeded at 1307 (offset 34 lines). > Hunk #12 succeeded at 1308 (offset -15 lines). > Hunk #13 succeeded at 1370 (offset 34 lines). > Hunk #14 succeeded at 1442 (offset -15 lines). > Hunk #15 FAILED at 1504. > Hunk #16 succeeded at 1577 (offset 35 lines). > Hunk #17 FAILED at 1587. > Hunk #18 succeeded at 1669 (offset 2 lines). > Hunk #19 succeeded at 1715 (offset 35 lines). > Hunk #20 succeeded at 1696 (offset 2 lines). > Hunk #21 FAILED at 1714. > Hunk #22 FAILED at 1768. > Hunk #23 FAILED at 1790. > Hunk #24 succeeded at 1891 (offset 67 lines). > Hunk #25 succeeded at 1853 (offset 2 lines). > Hunk #26 succeeded at 1945 (offset 67 lines). > Hunk #27 FAILED at 3429. > Hunk #28 FAILED at 3437. > Hunk #29 FAILED at 3454. > Hunk #30 succeeded at 3597 (offset 2 lines). > Hunk #31 succeeded at 3763 (offset 67 lines). > Hunk #32 succeeded at 3723 (offset 2 lines). > Hunk #33 succeeded at 3808 (offset 67 lines). > Hunk #34 succeeded at 3763 (offset 2 lines). > Hunk #35 succeeded at 3847 (offset 67 lines). > Hunk #36 succeeded at 3805 (offset 2 lines). > Hunk #37 succeeded at 3892 (offset 67 lines). > Hunk #38 succeeded at 3856 (offset 2 lines). > Hunk #39 succeeded at 3934 (offset 67 lines). > Hunk #40 succeeded at 4259 (offset 2 lines). > Hunk #41 FAILED at 4301. > Hunk #42 FAILED at 4443. > Hunk #43 succeeded at 4575 (offset 67 lines). > Hunk #44 FAILED at 4593. > Hunk #45 succeeded at 4565 with fuzz 2 (offset 5 lines). > Hunk #46 FAILED at 4588. > Hunk #47 succeeded at 4711 (offset 68 lines). > Hunk #48 succeeded at 4670 (offset 5 lines). > Hunk #49 succeeded at 4788 (offset 68 lines). > Hunk #50 succeeded at 4763 (offset 5 lines). > Hunk #51 succeeded at 5055 with fuzz 2 (offset 81 lines). > Hunk #52 succeeded at 5336 (offset 5 lines). > Hunk #53 succeeded at 5445 with fuzz 2 (offset 83 lines). > Hunk #54 FAILED at 5475. > Hunk #55 FAILED at 5512. > Hunk #56 FAILED at 5539. > Hunk #57 FAILED at 5574. > Hunk #58 succeeded at 5539 with fuzz 2 (offset 40 lines). > Hunk #59 FAILED at 5559. > 20 out of 59 hunks FAILED -- saving rejects to file > drivers/misc/thinkpad_acpi.c.rej > patching file drivers/misc/thinkpad_acpi.h > Hunk #2 FAILED at 61. > Hunk #3 succeeded at 86 (offset 1 line). > Hunk #4 FAILED at 197. > Hunk #5 FAILED at 260. > Hunk #6 succeeded at 368 (offset 4 lines). > Hunk #7 succeeded at 480 (offset 1 line). > Hunk #8 succeeded at 517 (offset 4 lines). > 3 out of 8 hunks FAILED -- saving rejects to file > drivers/misc/thinkpad_acpi.h.rej -- Florian Reitmeir ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ ibm-acpi-devel mailing list ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel
