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

@@ -9,7 +9,6 @@ · 8 unmodified lines
9	9	#include <string.h>
10	10	#include <errno.h>
11	11	#include <ctype.h>
12		−#include <sys/socket.h>
13	12
14	13	struct security_class_mapping {
15	14	const char *name;