Hi David, 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. Thanks a lot! ---------------------------------------------------------------- The following changes since commit 8005b09d99fac78e6f5fb9da30b5ae94840af03b: net: ethernet: davinci_emac: fix error handling in probe() (2018-05-31 16:12:00 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to 36f9814a494a874d5a0f44843544b4b2539022db: bpf: fix uapi hole for 32 bit compat applications (2018-06-01 20:41:35 -0700) ---------------------------------------------------------------- Daniel Borkmann (1): bpf: fix uapi hole for 32 bit compat applications include/uapi/linux/bpf.h | 2 ++ tools/include/uapi/linux/bpf.h | 2 ++ 2 files changed, 4 insertions(+)