On Wed, 3 Oct 2012 17:44:23 +0100 Catalin Marinas <catalin.marinas@xxxxxxx> wrote: > This patch introduces HAVE_UID16 config option and selects it in > corresponding architecture Kconfig files. UID16 now only depends on > HAVE_UID16. patching file arch/arm/Kconfig Hunk #1 FAILED at 49. 1 out of 1 hunk FAILED -- saving rejects to file arch/arm/Kconfig.rej patching file arch/arm64/Kconfig patching file arch/blackfin/Kconfig Hunk #1 FAILED at 42. 1 out of 1 hunk FAILED -- saving rejects to file arch/blackfin/Kconfig.rej patching file arch/cris/Kconfig Hunk #1 FAILED at 47. 1 out of 1 hunk FAILED -- saving rejects to file arch/cris/Kconfig.rej patching file arch/frv/Kconfig Hunk #1 FAILED at 10. 1 out of 1 hunk FAILED -- saving rejects to file arch/frv/Kconfig.rej patching file arch/h8300/Kconfig Hunk #1 FAILED at 6. 1 out of 1 hunk FAILED -- saving rejects to file arch/h8300/Kconfig.rej patching file arch/m68k/Kconfig Hunk #1 FAILED at 13. 1 out of 1 hunk FAILED -- saving rejects to file arch/m68k/Kconfig.rej patching file arch/s390/Kconfig Hunk #1 FAILED at 132. 1 out of 1 hunk FAILED -- saving rejects to file arch/s390/Kconfig.rej patching file arch/sh/Kconfig Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file arch/sh/Kconfig.rej This is a pet peeve of mine. Any time there's a long list of items (header file inclusions, kconfig entries, array initalisers, etc) and someone wants to add a new item, they *always* go and stick it at the end of the list. Which is exactly where everyone else applies their modifications. The whole thing is carefully set up to maximise the number of conflicts. Guys, don't do this. Either put the new item into a randomly-chosen position or, probably better, alphanumerically sort the list. For this reason it looks like approximately 0% of the patchset will apply, sorry. -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
