Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2020-08-02 01:02:12 -07:00
207 changed files with 1700 additions and 836 deletions

View File

@@ -359,8 +359,7 @@ int main(int argc, char **argv)
bool strict = false;
int arg_index = 0;
int failures = 0;
int s, t;
char opt;
int s, t, opt;
while ((opt = getopt_long(argc, argv, "", long_options,
&arg_index)) != -1) {