From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Borkmann Subject: Re: pull-request: bpf 2018-04-25 Date: Thu, 26 Apr 2018 06:42:25 +0200 Message-ID: <3a93f47f-88a3-bd02-92d2-e9ff80fed5d9@iogearbox.net> References: <20180425220450.17024-1-daniel@iogearbox.net> <20180425.230532.893947763052616175.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: ast@kernel.org, netdev@vger.kernel.org To: David Miller Return-path: Received: from www62.your-server.de ([213.133.104.62]:54042 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750924AbeDZEma (ORCPT ); Thu, 26 Apr 2018 00:42:30 -0400 In-Reply-To: <20180425.230532.893947763052616175.davem@davemloft.net> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 04/26/2018 05:05 AM, David Miller wrote: > From: Daniel Borkmann > Date: Thu, 26 Apr 2018 00:04:50 +0200 > >> The following pull-request contains BPF updates for your *net* tree. > ... >> Please consider pulling these changes from: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git > > Pulled, thanks Daniel. > >> Would be great if you have a chance to merge net into net-next after >> that since sockmap fixes are needed in bpf-next later on to avoid >> ugly merge conflicts. > > Done. Awesome, thanks!