From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762285AbdDSKkC (ORCPT ); Wed, 19 Apr 2017 06:40:02 -0400 Received: from ozlabs.org ([103.22.144.67]:46429 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762247AbdDSKkA (ORCPT ); Wed, 19 Apr 2017 06:40:00 -0400 From: Michael Ellerman To: Steven Rostedt , Linus Torvalds Cc: LKML Subject: Re: git process question In-Reply-To: <20170414180547.182f859c@gandalf.local.home> References: <20170414180547.182f859c@gandalf.local.home> User-Agent: Notmuch/0.21 (https://notmuchmail.org) Date: Wed, 19 Apr 2017 20:39:57 +1000 Message-ID: <87vaq065qa.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Steven Rostedt writes: > Hi Linus, > > I have a minor bug I found and a fix for it. I'm currently putting it > through the grind and will send it to you for this rc release cycle. > > Here's the question. My current linux-next development depends on this > fix. I already posted work to linux-next and do not want to rebase. > 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? ... > The alternatives are, ... > 2) Merge the development and urgent branches and continue working on > that. But I understand that you really don't like it when people do that. ^^^^^^^^^^^^^^^^^^^^ Is this part actually true? I ask because I have done it a few times and thought it was OK in general if there's a good reason for it. I make a point of using the same base for my fixes and next branches (ie. usually some rc), and then I don't fast forward my fixes branch when Linus merges it, or otherwise put anything in there other than the actual fixes. That means if I do merge it into next it doesn't bring anything else with it. cheers