History

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

Three trivial overlapping conflicts.

David S. Miller committed 7 years ago

Commit ff24e492 parents 26f146e ea98667167 files · +1373 −725Browse files

Showing the changes to scripts (2 of 167 files). Show all

Unified · Split

2 files
  1. scripts/selinux/genheaders/genheaders.c +0 −1
  2. scripts/selinux/mdp/mdp.c +0 −1
scripts/selinux/genheaders/genheaders.c+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
9#include <string.h>9#include <string.h>
10#include <errno.h>10#include <errno.h>
11#include <ctype.h>11#include <ctype.h>
12#include <sys/socket.h>
13 12
14struct security_class_mapping {13struct security_class_mapping {
15 const char *name;14 const char *name;
scripts/selinux/mdp/mdp.c+0−1
@@ -32,7 +32,6 @@ · 31 unmodified lines
32#include <stdlib.h>32#include <stdlib.h>
33#include <unistd.h>33#include <unistd.h>
34#include <string.h>34#include <string.h>
35#include <sys/socket.h>
36 35
37static void usage(char *name)36static void usage(char *name)
38{37{