From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935092AbeCGU0V (ORCPT ); Wed, 7 Mar 2018 15:26:21 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:56792 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934677AbeCGU0T (ORCPT ); Wed, 7 Mar 2018 15:26:19 -0500 Date: Wed, 07 Mar 2018 15:26:16 -0500 (EST) Message-Id: <20180307.152616.19450694775691873.davem@davemloft.net> To: paul@paul-moore.com Cc: lucien.xin@gmail.com, sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, richard_c_haines@btinternet.com Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree From: David Miller In-Reply-To: References: <20180307.124500.1863183408172828694.davem@davemloft.net> X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) 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 From: Paul Moore Date: Wed, 7 Mar 2018 15:20:33 -0500 >> So you would only have to wait until my tree went in before >> sending your pull request. > > So you would want me to rebase selinux/next on top of Linus' tree in > the middle of the merge window? I'm sure that isn't what you meant, > but that's how I keep reading the above ... which can't be right, > because in my experience that's one way to piss off Linus. Help me > understand what you are saying. I never said you rebase anything. I wonder where you get that from. I'm saying, you just defer your pull request until Linus takes my networking tree in. No changes or rebasing of your tree is necessary whatsoever. You just ask him to pull your tree as-is. Again, this is what other smaller subsystem trees do when they have a situation like this.