yeah, same here:
--------------------------------->
static void
ftrace_record_ip(unsigned long ip)
{
struct dyn_ftrace *node;
unsigned long flags;
unsigned long key;
int resched;
int atomic;
int cpu;
[...]
<--------------------------------
for me the primary motivation isnt even merge conflicts in this case
(getting conflicts on this level is rare), but readability and making it
smooth to move the eye off the variable declarations.
IMO good code is obvious even without having to read the types, so the
less visually intrusive the variable declarations section is, the
better.
Ingo
--