[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20180426.212048.449287312215018339.davem@davemloft.net>
Date: Thu, 26 Apr 2018 21:20:48 -0400 (EDT)
From: David Miller <davem@...emloft.net>
To: daniel@...earbox.net
Cc: ast@...nel.org, netdev@...r.kernel.org
Subject: Re: pull-request: bpf-next 2018-04-27
From: Daniel Borkmann <daniel@...earbox.net>
Date: Fri, 27 Apr 2018 03:14:42 +0200
> The following pull-request contains BPF updates for your *net-next* tree.
...
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Pulled and build testing before pushing back out.
> There are two trivial merge conflicts while pulling:
>
> 1) Remove samples/sockmap/Makefile since all sockmap tests have been
> moved to selftests.
> 2) Add both hunks from tools/testing/selftests/bpf/.gitignore to the
> file since git should ignore all of them.
Thanks for this.
Powered by blists - more mailing lists