Messages in this thread | | | Date | Wed, 8 Feb 2006 13:17:08 -0800 | From | Paul Jackson <> | Subject | Re: 2.6.16-rc2-mm1 |
| |
The broken out patch set for 2.6.16-rc2-mm1 is not applying for me.
The very first patch, linus.patch, has 74 FAIL'd files. Just pulling out the failing lines, I see some 180 lines of output, beginning with:
Applying patch linus.patch patching file arch/arm/mach-s3c2410/Makefile Hunk #1 FAILED at 10. Hunk #2 FAILED at 29. 2 out of 2 hunks FAILED -- rejects in file arch/arm/mach-s3c2410/Makefile patching file arch/arm/mm/proc-xscale.S Hunk #1 FAILED at 241. Hunk #2 FAILED at 260. 2 out of 2 hunks FAILED -- rejects in file arch/arm/mm/proc-xscale.S patching file arch/cris/Makefile Hunk #1 FAILED at 119. 1 out of 1 hunk FAILED -- rejects in file arch/cris/Makefile patching file arch/ia64/Kconfig Hunk #1 FAILED at 194. Hunk #2 succeeded at 375 with fuzz 2 (offset 2 lines). 1 out of 2 hunks FAILED -- rejects in file arch/ia64/Kconfig patching file arch/ia64/kernel/sal.c Hunk #1 FAILED at 14. Hunk #2 succeeded at 288 with fuzz 2 (offset 73 lines). Hunk #3 FAILED at 408. 2 out of 3 hunks FAILED -- rejects in file arch/ia64/kernel/sal.c
Looking hastily at the arch/arm/mach-s3c2410/Makefile, it looked like linus.patch was trying to add gpio support to a Makefile that already had it.
However ... I've been having a bad hair day with source control. So, if the above looks like operator error, it probably is.
-- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.925.600.0401 - 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/
| |