lkml.org 
[lkml]   [2008]   [May]   [14]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
/
DateWed, 14 May 2008 08:51:56 +0200
FromSam Ravnborg <>
SubjectRe: [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


\
 
 \ /
  Last update: 2008-05-14 08:53    [from the cache]
©2003-2008