From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755728AbdDOACi (ORCPT ); Fri, 14 Apr 2017 20:02:38 -0400 Received: from mail-it0-f43.google.com ([209.85.214.43]:36417 "EHLO mail-it0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755490AbdDOACg (ORCPT ); Fri, 14 Apr 2017 20:02:36 -0400 MIME-Version: 1.0 In-Reply-To: <20170414180547.182f859c@gandalf.local.home> References: <20170414180547.182f859c@gandalf.local.home> From: Linus Torvalds Date: Fri, 14 Apr 2017 17:02:34 -0700 X-Google-Sender-Auth: NUJFnO_ZihBgqOtj_FW3LYGPtzs Message-ID: Subject: Re: git process question To: Steven Rostedt Cc: LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Linus