From: David S. Miller <davem@davemloft.net>
Date: Fri, 17 Feb 2017 00:34:01 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.14-rc1~1463^2~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./linux/kernel/git/davem/net
---

3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb
diff --cc tools/lib/bpf/bpf.h
index 88f07c1,4ac6c4b..9f838aa
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@@ -33,15 -33,16 +33,16 @@@ int bpf_load_program(enum bpf_prog_typ
  		     __u32 kern_version, char *log_buf,
  		     size_t log_buf_sz);
  
 -int bpf_map_update_elem(int fd, void *key, void *value,
 +int bpf_map_update_elem(int fd, const void *key, const void *value,
  			__u64 flags);
  
 -int bpf_map_lookup_elem(int fd, void *key, void *value);
 -int bpf_map_delete_elem(int fd, void *key);
 -int bpf_map_get_next_key(int fd, void *key, void *next_key);
 +int bpf_map_lookup_elem(int fd, const void *key, void *value);
 +int bpf_map_delete_elem(int fd, const void *key);
 +int bpf_map_get_next_key(int fd, const void *key, void *next_key);
  int bpf_obj_pin(int fd, const char *pathname);
  int bpf_obj_get(const char *pathname);
- int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type);
+ int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type,
+ 		    unsigned int flags);
  int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);