From: Daniel Borkmann <dan...@iogearbox.net> Date: Sat, 2 Jun 2018 07:07:22 +0200
> The following pull-request contains BPF updates for your *net* tree. > > The main changes are: > > 1) BPF uapi fix in struct bpf_prog_info and struct bpf_map_info in > order to fix offsets on 32 bit archs. > > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git > > This will have a minor merge conflict with net-next which has the > __u32 gpl_compatible:1 bitfield in struct bpf_prog_info at this > location. Resolution is to use the gpl_compatible member. Pulled, thanks Daniel.
