From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753963Ab1AVCbt (ORCPT ); Fri, 21 Jan 2011 21:31:49 -0500 Received: from thunk.org ([69.25.196.29]:53054 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791Ab1AVCbs (ORCPT ); Fri, 21 Jan 2011 21:31:48 -0500 Date: Fri, 21 Jan 2011 21:31:38 -0500 From: "Ted Ts'o" To: Daniel Walker Cc: Pekka Enberg , Dima Zavin , Jesse Barnes , Joe Perches , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, davidb@codeaurora.org Subject: Re: [PATCH 0/7] Nexus One Support Message-ID: <20110122023138.GQ3043@thunk.org> Mail-Followup-To: Ted Ts'o , Daniel Walker , Pekka Enberg , Dima Zavin , Jesse Barnes , Joe Perches , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, davidb@codeaurora.org References: <20110121094827.41818a55@jbarnes-desktop> <20110121095658.1ab623fe@jbarnes-desktop> <1295632828.19880.22.camel@m0nster> <20110121100441.06a94482@jbarnes-desktop> <1295633882.19880.31.camel@m0nster> <1295642995.19880.42.camel@m0nster> <20110121234930.GK3043@thunk.org> <1295654593.22882.9.camel@m0nster> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1295654593.22882.9.camel@m0nster> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on thunker.thunk.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 21, 2011 at 04:03:13PM -0800, Daniel Walker wrote: > > right, but it wasn't a cherrypick which was explain in the thread. So > there's no wrongs here .. I said the *equivalent* of a cherry-pick. And in general, if I'm taking things from another git tree, I'll try to preserve the commit structure as much as possible, preserve the Author: information, as well as reference the original git tree and commit id's, and of course, keep the signed-off-by's. That's true even if I need to do fairly significant work to port it to the current tree. In some cases, of course, that might not be possible. But in general, it's much better to err on the side of including authorship than not. Note the big uproar that happened when the code from BSD wireless drivers were imported in without due care for attribution. In the case of pulling commits from another Linux kernel source tree, there isn't even the excuse of needing to port from a completely different OS's infrastructure. If there is a desire to keep the git tree bisectable, and the order in which things were checked in don't allow for tree bisectability, sure, that might be a reason to collapse commits together; but even then, I'd probably choose one of the Author's of the two original commits as the Author field, instead of substituting my name in. Best regards, - Ted