[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20080724223412.4ab223b1@mjolnir.drzeus.cx>
Date: Thu, 24 Jul 2008 22:34:12 +0200
From: Pierre Ossman <drzeus@...eus.cx>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: pHilipp Zabel <philipp.zabel@...il.com>, 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>
Subject: Re: [stable] [patch 44/47] pxamci: fix byte aligned DMA transfers
On Thu, 24 Jul 2008 12:22:56 -0700 (PDT)
Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> 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.
Indeed I did. Things got shuffled around a bit when I updated the
patch queue with more stuff and the old attempt hadn't gotten merged
yet.
>
> 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.
I've always considered my "for-linus" branch to be primarily that, but I
guess I can be more careful so that other people can use it as well.
Rgds
--
-- Pierre Ossman
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
Download attachment "signature.asc" of type "application/pgp-signature" (198 bytes)
Powered by blists - more mailing lists