[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.1.10.0807241219480.3237@nehalem.linux-foundation.org>
Date: Thu, 24 Jul 2008 12:22:56 -0700 (PDT)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: pHilipp Zabel <philipp.zabel@...il.com>
cc: Greg KH <greg@...ah.com>, Greg KH <gregkh@...e.de>,
"Theodore Ts'o" <tytso@....edu>,
Zwane Mwaikambo <zwane@....linux.org.uk>,
Justin Forbes <jmforbes@...uxtx.org>,
linux-kernel@...r.kernel.org,
Chris Wedgwood <reviews@...cw.f00f.org>,
Domenico Andreoli <cavokz@...il.com>,
akpm@...ux-foundation.org, Randy Dunlap <rdunlap@...otime.net>,
Willy Tarreau <w@....eu>,
Chuck Wolber <chuckw@...ntumlinux.com>,
alan@...rguk.ukuu.org.uk, Chuck Ebbert <cebbert@...hat.com>,
Dave Jones <davej@...hat.com>, Jake Edge <jake@....net>,
Michael Krufky <mkrufky@...uxtv.org>, stable@...nel.org,
Rodrigo Rubira Branco <rbranco@...checkpoint.com>,
Pierre Ossman <drzeus@...eus.cx>
Subject: Re: [stable] [patch 44/47] pxamci: fix byte aligned DMA transfers
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists