summaryrefslogtreecommitdiffstats
path: root/net/ncsi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-06-02 08:07:52 -0400
committerDavid S. Miller <davem@davemloft.net>2018-06-02 08:07:52 -0400
commitcd075ce4679ca7797734c4f6c5aa23878c8e2208 (patch)
tree2bcce553c20dbb6a49019429ae89a0324b5e6b9c /net/ncsi
parent9f7c728332e8966084242fcd951aa46583bc308c (diff)
parent36f9814a494a874d5a0f44843544b4b2539022db (diff)
downloadlinux-cd075ce4679ca7797734c4f6c5aa23878c8e2208.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2018-06-02 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. 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. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ncsi')
0 files changed, 0 insertions, 0 deletions