diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-02 22:14:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-02 22:14:21 -0400 |
| commit | ff24e4980a68d83090a02fda081741a410fe8eef (patch) | |
| tree | 4d874dfcaf2bb8c3abc2446af9447a983402c0ae /scripts | |
| parent | 26f146ed971c0e4a264ce525d7a66a71ef73690d (diff) | |
| parent | ea9866793d1e925b4d320eaea409263b2a568f38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/selinux/genheaders/genheaders.c | 1 | ||||
| -rw-r--r-- | scripts/selinux/mdp/mdp.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index 1ceedea847dd..544ca126a8a8 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c | |||
| @@ -9,7 +9,6 @@ | |||
| 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 | ||
| 14 | struct security_class_mapping { | 13 | struct security_class_mapping { |
| 15 | const char *name; | 14 | const char *name; |
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c index 073fe7537f6c..6d51b74bc679 100644 --- a/scripts/selinux/mdp/mdp.c +++ b/scripts/selinux/mdp/mdp.c | |||
| @@ -32,7 +32,6 @@ | |||
| 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 | ||
| 37 | static void usage(char *name) | 36 | static void usage(char *name) |
| 38 | { | 37 | { |