[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20180517.233443.2074385086132486646.davem@davemloft.net>
Date: Thu, 17 May 2018 23:34:43 -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 2018-05-18
From: Daniel Borkmann <daniel@...earbox.net>
Date: Fri, 18 May 2018 02:26:17 +0200
> The following pull-request contains BPF updates for your *net* tree.
>
> The main changes are:
...
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Pulled.
> When this gets later merged into net-next there are a two trivial
> BPF conflicts to resolve:
...
Thanks a lot for the conflict guidance.
Powered by blists - more mailing lists