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 17:51:07 -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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=20cf303f6aeabca73b04b636dee7 Return-path: In-Reply-To: <20120106084701.8f704542754db826deda318a@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell , Junio C Hamano , Git Mailing List Cc: "Michael S. Tsirkin" , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Jesse Barnes , Andrew Morton List-Id: linux-arch.vger.kernel.org --20cf303f6aeabca73b04b636dee7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Thu, Jan 5, 2012 at 1:47 PM, Stephen Rothwell wro= te: > On Fri, 6 Jan 2012 08:39:16 +1100 Stephen Rothwell = wrote: >> >> So why does you pull request refer to "commit >> 805a6af8dba5dfdd35ec35dc52ec0122400b2610", I wonder? =A0Is that just wha= t >> "git request-pull" produced? > > I see, "git request-pull" just puts in whatever you specify on the > command line rather than the merge-base ... .. and that is a fairly silly misfeature, since it makes the "since commit xyz" largely meaningless. I suspect we really should make "git request-pull" show the merge base(s) as the "since commit", because that way the output of git request-pull is "stable", and doesn't depend on what particular random state you've synced up to since. Junio, I think the patch would be as simple as the attached - totally untested - one-liner? Comments? Linus --20cf303f6aeabca73b04b636dee7 Content-Type: text/x-patch; charset=US-ASCII; name="patch.diff" Content-Disposition: attachment; filename="patch.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gx9oxpud1 IGdpdC1yZXF1ZXN0LXB1bGwuc2ggfCAgICAyICstCiAxIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9naXQtcmVxdWVzdC1wdWxsLnNo IGIvZ2l0LXJlcXVlc3QtcHVsbC5zaAppbmRleCBkN2JhMTE3OGFlNzUuLjY0OTYwZDY1YTFjMiAx MDA3NTUKLS0tIGEvZ2l0LXJlcXVlc3QtcHVsbC5zaAorKysgYi9naXQtcmVxdWVzdC1wdWxsLnNo CkBAIC05Niw3ICs5Niw3IEBAIGdpdCBzaG93IC1zIC0tZm9ybWF0PSdUaGUgZm9sbG93aW5nIGNo YW5nZXMgc2luY2UgY29tbWl0ICVIOgogICAlcyAoJWNpKQogCiBhcmUgYXZhaWxhYmxlIGluIHRo ZSBnaXQgcmVwb3NpdG9yeSBhdDoKLScgJGJhc2VyZXYgJiYKKycgJG1lcmdlX2Jhc2UgJiYKIGVj aG8gIiAgJHVybCR7cmVmKyAkcmVmfSIgJiYKIGdpdCBzaG93IC1zIC0tZm9ybWF0PScKIGZvciB5 b3UgdG8gZmV0Y2ggY2hhbmdlcyB1cCB0byAlSDoK --20cf303f6aeabca73b04b636dee7-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-gy0-f174.google.com ([209.85.160.174]:64394 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754463Ab2AKBv3 (ORCPT ); Tue, 10 Jan 2012 20:51:29 -0500 MIME-Version: 1.0 In-Reply-To: <20120106084701.8f704542754db826deda318a@canb.auug.org.au> References: <20120105145836.GA2751@redhat.com> <20120106083141.9c14a8d2d09539c6a6c0db75@canb.auug.org.au> <20120106083916.9588034bde22a6803e327aa9@canb.auug.org.au> <20120106084701.8f704542754db826deda318a@canb.auug.org.au> From: Linus Torvalds Date: Tue, 10 Jan 2012 17:51:07 -0800 Message-ID: Subject: Re: [GIT PULL] use generic pci_iomap on all architectures Content-Type: multipart/mixed; boundary=20cf303f6aeabca73b04b636dee7 Sender: linux-arch-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Junio C Hamano , Git Mailing List Cc: "Michael S. Tsirkin" , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Jesse Barnes , Andrew Morton Message-ID: <20120111015107.5_xhpTtGi1G97Ch-PaeDTYzhgHeXSlgQ85l15OkPKPU@z> --20cf303f6aeabca73b04b636dee7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Thu, Jan 5, 2012 at 1:47 PM, Stephen Rothwell wro= te: > On Fri, 6 Jan 2012 08:39:16 +1100 Stephen Rothwell = wrote: >> >> So why does you pull request refer to "commit >> 805a6af8dba5dfdd35ec35dc52ec0122400b2610", I wonder? =A0Is that just wha= t >> "git request-pull" produced? > > I see, "git request-pull" just puts in whatever you specify on the > command line rather than the merge-base ... .. and that is a fairly silly misfeature, since it makes the "since commit xyz" largely meaningless. I suspect we really should make "git request-pull" show the merge base(s) as the "since commit", because that way the output of git request-pull is "stable", and doesn't depend on what particular random state you've synced up to since. Junio, I think the patch would be as simple as the attached - totally untested - one-liner? Comments? Linus --20cf303f6aeabca73b04b636dee7 Content-Type: text/x-patch; charset=US-ASCII; name="patch.diff" Content-Disposition: attachment; filename="patch.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gx9oxpud1 IGdpdC1yZXF1ZXN0LXB1bGwuc2ggfCAgICAyICstCiAxIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9naXQtcmVxdWVzdC1wdWxsLnNo IGIvZ2l0LXJlcXVlc3QtcHVsbC5zaAppbmRleCBkN2JhMTE3OGFlNzUuLjY0OTYwZDY1YTFjMiAx MDA3NTUKLS0tIGEvZ2l0LXJlcXVlc3QtcHVsbC5zaAorKysgYi9naXQtcmVxdWVzdC1wdWxsLnNo CkBAIC05Niw3ICs5Niw3IEBAIGdpdCBzaG93IC1zIC0tZm9ybWF0PSdUaGUgZm9sbG93aW5nIGNo YW5nZXMgc2luY2UgY29tbWl0ICVIOgogICAlcyAoJWNpKQogCiBhcmUgYXZhaWxhYmxlIGluIHRo ZSBnaXQgcmVwb3NpdG9yeSBhdDoKLScgJGJhc2VyZXYgJiYKKycgJG1lcmdlX2Jhc2UgJiYKIGVj aG8gIiAgJHVybCR7cmVmKyAkcmVmfSIgJiYKIGdpdCBzaG93IC1zIC0tZm9ybWF0PScKIGZvciB5 b3UgdG8gZmV0Y2ggY2hhbmdlcyB1cCB0byAlSDoK --20cf303f6aeabca73b04b636dee7--