Re: [git-pull -tip] x86: include inverse Xmas tree patches

[H. Peter Anvin]

Sam Ravnborg wrote:
> 
> Ordering include based on length of line minimize the
> risk of merge conflicts.
> If people just add new includes in the bottom of the list you
> are certain that a merge conflit happens.
> 
> This scheme is starting to be used in several places with the
> primary advocates being David Miller and Ingo.
> 
> It is getting used both for includes _and_ for local variables.
> 

Personally I'd prefer alphabetic order, sorting based on length isn't a
complete ordering.  Nearly all editors can sort alphabetically at the
push of a key.

	-hpa
--
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/