> 
quoted text
> [ also a patch integration detail: i took the liberty to move your 
>   arch/sparc64/Kconfig's HAVE_FTRACE to the first spot of the SPARC64 
>   select lines as per the second patch below - your patch had a conflict 
>   against current mainline (which probably means you already changed 
>   this file in your Sparc64 tree). By moving that entry to the first 
>   line your tree and the ftrace tree should auto-merge just fine without 
>   any conflicts. ]

When adding new select entries I try to keep them sorted alphabetically.
It will not solve all the merge issues but as the list grows this should
help. At least betterthan adding to the end.

	Sam
--
unsubscribe notice
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/