From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755798AbdDOAI2 (ORCPT ); Fri, 14 Apr 2017 20:08:28 -0400 Received: from mail.kernel.org ([198.145.29.136]:42210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755654AbdDOAI1 (ORCPT ); Fri, 14 Apr 2017 20:08:27 -0400 Date: Fri, 14 Apr 2017 20:08:22 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML Subject: Re: git process question Message-ID: <20170414200822.2ee9f0f8@gandalf.local.home> In-Reply-To: References: <20170414180547.182f859c@gandalf.local.home> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 14 Apr 2017 17:02:34 -0700 Linus Torvalds wrote: > On Fri, Apr 14, 2017 at 3:05 PM, Steven Rostedt wrote: > > > > Would it be OK to cherry pick this change that I send to you, which > > will be based on a commit in your tree, into my development branch > > where I can continue the work on top of the previous development that's > > in linux-next and the fix? > > Yes, the occasional duplicated commit due to real reasons is fine. I > get worried if people start using cherry-picking and rebasing as a > _process_, but if the process generally works, and then there's an > occasional need to fix something like this, that's perfectly fine. Thanks for the response. So I'll take it that the general idea would be to send you a fix based on one of my commits that's already in your tree. Then, if new development that is based on that fix, but nothing I pushed to linux-next, even if I had already pushed commits to linux-next, then I would just start the development off of that fix, and send you multiple pull requests (one for the fix + development changes, and one with the linux-next development changes). But if there's a case like this, where I have development changes based on both the fix and changes I already pushed to linux-next, then I would just cherry pick that into the development branch and continue. Sounds good, -- Steve