Re: [PATCH 0/2]: Add sparc64 ftrace support.

[Ingo Molnar]

* Sam Ravnborg <sam@xxxxxxxxxxxx> wrote:

> > [ 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.

yep, i do that too in other cases - but the list here is very short. 
Btw., i also do sorting for include file names, such as in 
kernel/trace/ftrace.c:

 #include <linux/stop_machine.h>
 #include <linux/clocksource.h>
 #include <linux/kallsyms.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/kthread.h>
 #include <linux/hardirq.h>
 #include <linux/ftrace.h>
 #include <linux/uaccess.h>
 #include <linux/sysctl.h>
 #include <linux/hash.h>
 #include <linux/ctype.h>
 #include <linux/list.h>

 #include "trace.h"

(i also sort by length to make it visually more appealing. "Reverse 
christmas tree" sorting ;-)

[ and yes, linux/uaccess.h is mis-sorted - fixed. ]

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/