From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: (unknown) Date: Fri, 19 Oct 2018 10:46:25 -0700 (PDT) Message-ID: <20181019.104625.891840017846483385.davem@davemloft.net> References: <11408.1539960053@warthog.procyon.org.uk> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, linux-afs@lists.infradead.org To: dhowells@redhat.com Return-path: Received: from shards.monkeyblade.net ([23.128.96.9]:46334 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727817AbeJTBxb (ORCPT ); Fri, 19 Oct 2018 21:53:31 -0400 In-Reply-To: <11408.1539960053@warthog.procyon.org.uk> Sender: netdev-owner@vger.kernel.org List-ID: From: David Howells Date: Fri, 19 Oct 2018 15:40:53 +0100 > Is there going to be a merge of net into net-next before the merge > window opens? Or do you have a sample merge that I can rebase my > afs-next branch on? I'll be doing a net to net-next merge some time today.