Messages in this thread |  | | | Date | Wed, 14 May 2008 08:51:56 +0200 | | From | Sam Ravnborg <> | | Subject | Re: [PATCH 0/2]: Add sparc64 ftrace support. | |
>
> [ 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
|  |