[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.1.00.0802071332480.2896@woody.linux-foundation.org>
Date: Thu, 7 Feb 2008 13:40:45 -0800 (PST)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Andrew Morton <akpm@...ux-foundation.org>
cc: Grant Likely <grant.likely@...retlab.ca>, jirislaby@...il.com,
stephen.neuendorffer@...inx.com, linux-kernel@...r.kernel.org,
paulus@...ba.org, galak@...e.crashing.org, benh@...nel.crashing.org
Subject: Re: Xilinx: hwicap driver comments
On Thu, 7 Feb 2008, Andrew Morton wrote:
>
> It seems wrong that the signoff trail for that patch didn't actually
> reflect reality - it should have had both Josh's and Paul's signoffs.
No, it's correct.
If you look deeper, you'll see (in gitk, or using "--pretty=fuller") that
it has:
Author: Stephen Neuendorffer <stephen.neuendorffer@...inx.com>
Commit: Grant Likely <grant.likely@...retlab.ca>
which means that the sign-off chain is complete and matches:
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@...inx.com>
Signed-off-by: Grant Likely <grant.likely@...retlab.ca>
ie it was written by Stephen, and then committed by Grant, and that's the
whole sequence.
Then, of course, that commit was merged into another tree entirely (by
Josh) in 256ae6a720618cbbfacc5e62ea1fe7c129d1b644, and by Paul in
5ab3e84f66321579ca36b63a13bf78decba65121 and then finally by me in
37969581301e50872a1ae84dc73962b5f7ee6b76, but those merge commits only
show up because there was other development too (ie those things would not
have showed up at all if the merges had been just fast-forwards).
So in general, the rule is that the sign-off chain should take you from
the author to the committer.
You can't really go any further: we could have some "forced sign-off on
merge between trees", but that would not just be inconvenient, it is
fundamentally questionable in a git environment: who is "upstream" is
really just a matter of opinion (ie I may be "obviously upstream", but if
I have merge problems I'll actually ask the downstream person to do the
merge, because he's the one who has the knowledge about that particular
merge!)
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