]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efaef0b 98631f1)
Merge branch 'master' into next
authorDavid Ahern <dsahern@gmail.com>
Wed, 4 Sep 2019 14:48:15 +0000 (07:48 -0700)
committerDavid Ahern <dsahern@gmail.com>
Wed, 4 Sep 2019 14:48:15 +0000 (07:48 -0700)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
include/uapi/linux/bpf.h patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/bpf.h
Simple merge
Upstream mirror of iproute2