Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2018-05-24

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

The main changes are:

1) Björn Töpel cleans up AF_XDP (removes rebind, explicit cache alignment from uapi, etc).

2) David Ahern adds mtu checks to bpf_ipv{4,6}_fib_lookup() helpers.

3) Jesper Dangaard Brouer adds bulking support to ndo_xdp_xmit.

4) Jiong Wang adds support for indirect and arithmetic shifts to NFP

5) Martin KaFai Lau cleans up BTF uapi and makes the btf_header extensible.

6) Mathieu Xhonneux adds an End.BPF action to seg6local with BPF helpers allowing
   to edit/grow/shrink a SRH and apply on a packet generic SRv6 actions.

7) Sandipan Das adds support for bpf2bpf function calls in ppc64 JIT.

8) Yonghong Song adds BPF_TASK_FD_QUERY command for introspection of tracing events.

9) other misc fixes from Gustavo A. R. Silva, Sirio Balmelli, John Fastabend, and Magnus Karlsson
====================

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

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/net/ip6_route.h
Simple merge

diff --cc kernel/bpf/sockmap.c
index cd83225,3b28955..52a91d8
--- 1/kernel/bpf/sockmap.c
--- 2/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@@ -1823,13 -1824,12 +1824,12 @@@ static int __sock_map_ctx_update_elem(s
        write_unlock_bh(&sock->sk_callback_lock);
        return err;
  out_free:
-       kfree(e);
        smap_release_sock(psock, sock);
  out_progs:
 -      if (verdict)
 -              bpf_prog_put(verdict);
 -      if (parse)
 +      if (parse && verdict) {
                bpf_prog_put(parse);
 +              bpf_prog_put(verdict);
 +      }
        if (tx_msg)
                bpf_prog_put(tx_msg);
        write_unlock_bh(&sock->sk_callback_lock);

diff --cc net/core/filter.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc samples/bpf/Makefile
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge