From: David S. Miller <davem@davemloft.net>
Date: Thu, 29 Nov 2018 06:10:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e561bb29b650d2817d10a4858f1817836ed08399;p=openwrt%2Fstaging%2Fblogic.git

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

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e561bb29b650d2817d10a4858f1817836ed08399
diff --cc tools/bpf/bpftool/main.h
index 3e8979567cf1,a8bf1e2d9818..7431669fae0a
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@@ -129,9 -127,8 +129,9 @@@ int cmd_select(const struct cmd *cmds, 
  int get_fd_type(int fd);
  const char *get_fd_type_name(enum bpf_obj_type type);
  char *get_fdinfo(int fd, const char *key);
- int open_obj_pinned(char *path);
+ int open_obj_pinned(char *path, bool quiet);
  int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type);
 +int mount_bpffs_for_pin(const char *name);
  int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32));
  int do_pin_fd(int fd, const char *name);