Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755233AbYGXT3V (ORCPT ); Thu, 24 Jul 2008 15:29:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753511AbYGXT3K (ORCPT ); Thu, 24 Jul 2008 15:29:10 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:44986 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753314AbYGXT3I (ORCPT ); Thu, 24 Jul 2008 15:29:08 -0400 Date: Thu, 24 Jul 2008 12:22:56 -0700 (PDT) From: Linus Torvalds To: pHilipp Zabel cc: Greg KH , Greg KH , "Theodore Ts'o" , Zwane Mwaikambo , Justin Forbes , linux-kernel@vger.kernel.org, Chris Wedgwood , Domenico Andreoli , akpm@linux-foundation.org, Randy Dunlap , Willy Tarreau , Chuck Wolber , alan@lxorguk.ukuu.org.uk, Chuck Ebbert , Dave Jones , Jake Edge , Michael Krufky , stable@kernel.org, Rodrigo Rubira Branco , Pierre Ossman Subject: Re: [stable] [patch 44/47] pxamci: fix byte aligned DMA transfers In-Reply-To: <74d0deb30807240333l565eaf24uf695ce8d01597090@mail.gmail.com> Message-ID: References: <20080722230208.148102983@mini.kroah.org> <20080722231342.GA8282@suse.de> <20080722231735.GS8282@suse.de> <74d0deb30807230001x176e375cq9a8060c20596f36f@mail.gmail.com> <20080723201258.GA26156@kroah.com> <20080723203250.GA26454@kroah.com> <74d0deb30807240333l565eaf24uf695ce8d01597090@mail.gmail.com> User-Agent: Alpine 1.10 (LFD 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1407 Lines: 32 On Thu, 24 Jul 2008, pHilipp Zabel wrote: > > On Wed, Jul 23, 2008 at 01:24:12PM -0700, Linus Torvalds wrote: > >> > >> Hmm. I think it's commit 4fe16897c59882420d66f2d503106653d026ed6c > >> upstream. I don't know why it has a different SHA1 in the mmc tree, but I > >> assume that it's because the MMC tree has rebased at some point. Ugh. > > Thank you, I think when I wrote my mail it wasn't pulled yet. Pulling doesn't change the SHA1 ID of a commit, so _if_ it had been stable in the -mmc tree, it would have had the same commit in the kernel too. That's very much a design issue in git: the same commit always has the same ID. _ALWAYS_. So the fact that the ID changed implies that something odd happened in the -mmc tree. Most likely a rebase. And again, this implies that somebody rebased already-public commits, since otherwise nobody would have ever even seen the original SHA1 ID. Which is not good behaviour, _exactly_ because it makes it much harder for people to work together - suddenly a commit that got reported (for whatever reason: bug-report or 'please backport', it's all the same issue in the end) no longer exists. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/