From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: [GIT PULL] use generic pci_iomap on all architectures Date: Tue, 10 Jan 2012 18:52:25 -0800 Message-ID: References: <20120105145836.GA2751@redhat.com> <20120106083141.9c14a8d2d09539c6a6c0db75@canb.auug.org.au> <20120106083916.9588034bde22a6803e327aa9@canb.auug.org.au> <20120106084701.8f704542754db826deda318a@canb.auug.org.au> <7vipkj7ykd.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from mail-yx0-f174.google.com ([209.85.213.174]:60196 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757050Ab2AKCwr (ORCPT ); Tue, 10 Jan 2012 21:52:47 -0500 In-Reply-To: <7vipkj7ykd.fsf@alter.siamese.dyndns.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Junio C Hamano Cc: Stephen Rothwell , Git Mailing List , "Michael S. Tsirkin" , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Jesse Barnes , Andrew Morton On Tue, Jan 10, 2012 at 6:38 PM, Junio C Hamano wrote: > > The parameter to "git shortlog" that appears later should also be updated > to match this, by the way, even though that should not affect the outcome > in any way. No, don't do that part. Why? Remember: there can be *multiple* merge bases. The expression git shortlog ^$baserev $headrev always works, but changing "baserev" to "merge_base" will suddenly break for the multiple merge-bases case. > I am however not sure what would happen when there are more than one merge > bases. I guess those who throw pull requests are not supposed to be doing > merges in reverse direction, so it should not matter ;-) The other cases don't really care. For them, "show one merge-base" is fine, and they are "end-point" operations (like "diff") that really cannot handle a set of commits anyway. But for "git shortlog", switching to using the merge base would actually start showing commits that shouldn't be shown. It's fundamentally a set operator, and does the right thing in the presense of multiple merge-bases (which "diff" and "since commit XYZ" are clearly not set operators, although arguably you could try to show all merge bases for the "since" case). Linus