tree 1cd16acb999bea8de6e8b008c1a4819da851b6c3
parent d65026c6c62e7d9616c8ceb5a53b68bcdc050525
parent e8a4796ee2954db9f7e9b52e5fbc66ef876752f6
author David S. Miller <davem@davemloft.net> 1522374559 -0400
committer David S. Miller <davem@davemloft.net> 1522374559 -0400

Merge git://git.kernel.org/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>