From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: Please merge net into net-next Date: Tue, 01 Aug 2017 15:08:33 -0700 (PDT) Message-ID: <20170801.150833.1192957425530610514.davem@davemloft.net> References: <7b79c842-4349-0537-5644-b4b2974d1668@solarflare.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: ecree@solarflare.com Return-path: Received: from shards.monkeyblade.net ([184.105.139.130]:38752 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbdHAWIe (ORCPT ); Tue, 1 Aug 2017 18:08:34 -0400 In-Reply-To: <7b79c842-4349-0537-5644-b4b2974d1668@solarflare.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Edward Cree Date: Mon, 31 Jul 2017 18:25:16 +0100 > Could you please merge net into net-next, so I can rebase my BPF patches? > Otherwise there's likely to be merge conflicts with the BPF_SUB fix. This has now been done.