From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755043AbdDNWFy (ORCPT ); Fri, 14 Apr 2017 18:05:54 -0400 Received: from mail.kernel.org ([198.145.29.136]:35960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752365AbdDNWFw (ORCPT ); Fri, 14 Apr 2017 18:05:52 -0400 Date: Fri, 14 Apr 2017 18:05:47 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML Subject: git process question Message-ID: <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 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 commit I cherry pick will just evaporate into git mist when you pull my development branch in the next merge window, as git does the distilling of commits that are identical. But I want to make sure you are OK with this plan before I head out and do this. The alternatives are, 1) Rebase my current work in linux-next and retest everything from scratch. I really don't like doing this. 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. Thoughts? -- Steve