On Wed, Oct 03, 2012 at 11:15:05PM +0100, Andrew Morton wrote:

On Wed,  3 Oct 2012 17:44:23 +0100
Catalin Marinas [off-list ref] wrote:

quoted

This patch introduces HAVE_UID16 config option and selects it in
corresponding architecture Kconfig files. UID16 now only depends on
HAVE_UID16.

patching file arch/arm/Kconfig
Hunk #1 FAILED at 49.

...

This is a pet peeve of mine.  Any time there's a long list of items
(header file inclusions, kconfig entries, array initalisers, etc) and
someone wants to add a new item, they *always* go and stick it at the
end of the list.

Which is exactly where everyone else applies their modifications.  The
whole thing is carefully set up to maximise the number of conflicts.

Guys, don't do this.  Either put the new item into a randomly-chosen
position or, probably better, alphanumerically sort the list.

I will repost a v2 with randomly chosen position. Sorting is better but
it would cause even more conflicts at this stage. It would be suitable
for a later -rc clean-up though.

-- 
Catalin