From: Paul Mackerras <paulus@samba.org>
Date: Sat, 04 Feb 2006 10:46:21 GMT
Subject: Re: The merge from hell...
Message-ID: <17380.34301.584514.520465@cargo.ozlabs.ibm.com>
In-Reply-To: <7v8xsuuto5.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano writes:

> Linus Torvalds <torvalds@osdl.org> writes:
> > That octopus commit has got _twelve_ parents.

Making it a dodecapus, or something? :)

> But this is still interesting:
> 
> @@@@@@@@@@@@@ +308,35 @@@@@@@@@@@@@
>             			goto end;
>             		}
>             	}
>   --        	cx->usage++;
>   --        
>             
>      +++    #ifdef CONFIG_HOTPLUG_CPU
>      +++    	/*

Why is that interesting?  It seems to me that two independent changes
were made that just happened to be within a couple of lines of each
other, but didn't interact.  The reason that one change appears in two
branches, and the other in 3, is I think just related to where the
branches start from.  So IMHO this hunk isn't interesting.

Paul.