From: David S. Miller <davem@davemloft.net>
Date: Fri, 30 Mar 2018 01:49:19 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=74957cbfb7eabe7639a22bd58f45a99bde42fd0c;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkman says:

====================
pull-request: bpf 2018-03-29

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix nfp to properly check max insn count while emitting
   instructions in the JIT which was wrongly comparing bytes
   against number of instructions before, from Jakub.

2) Fix for bpftool to avoid usage of hex numbers in JSON
   output since JSON doesn't accept hex numbers with 0x
   prefix, also from Jakub.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

74957cbfb7eabe7639a22bd58f45a99bde42fd0c