Hello and sorry for the delay On Mon, Jan 15, 2007 at 04:01:14AM -0500, Luming Yu wrote: > Patch series is not clean against 2.6.20-rc5. > > patch -p1 < ../malattia_sony/1_snc_device_support_for_sony_va > io.patch > patching file Documentation/acpi/sony_acpi.txt > patching file drivers/acpi/Kconfig > Hunk #1 succeeded at 252 with fuzz 2 (offset -9 lines). > patching file drivers/acpi/Makefile > Hunk #1 FAILED at 54. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/acpi/Makefile.rej > patching file drivers/acpi/sony_acpi.c ... uh. I'm developing on the acpi tree test branch, however I just tried the patches on a freshly unpacked/patched .20-rc5 and the patches apply without any reject. # for i in ../*.patch ; do patch -p1 < $i ; done patching file Documentation/acpi/sony_acpi.txt patching file drivers/acpi/Kconfig Hunk #1 succeeded at 252 (offset -9 lines). patching file drivers/acpi/Makefile Hunk #1 succeeded at 53 (offset -1 lines). patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/Kconfig Hunk #1 succeeded at 255 (offset -9 lines). patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c patching file drivers/acpi/sony_acpi.c > patch -p1 < ../malattia_sony/2_avoid_dimness_on_resume.patch > patching file drivers/acpi/sony_acpi.c > Hunk #1 succeeded at 46 with fuzz 2. > Hunk #2 FAILED at 56. > Hunk #3 FAILED at 228. > Hunk #4 succeeded at 353 with fuzz 1. > Hunk #5 succeeded at 375 with fuzz 1. > 2 out of 5 hunks FAILED -- saving rejects to file > drivers/acpi/sony_acpi.c.rej The really strange thing is that since the sony_acpi.c file doesn't exist in mainline and is created in the first patch, at least the patches on it shouldn't fail... :) hummm... could you retry with a fresh tree? -- mattia :wq! - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
