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

Simple cases of overlapping changes in the packet scheduler. Must easier to resolve this time. Which probably means that I screwed it up somehow. Signed-off-by: David S. Miller <davem@davemloft.net>
author: David S. Miller <davem@davemloft.net> 2017-11-09 20:00:18 -0500
committer: David S. Miller <davem@davemloft.net> 2017-11-09 20:00:18 -0500
commit: 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch)
tree: 992e5d5996910af35a5c12fe94da14d0bb167452 /tools/include
parent: 19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8 (diff)
parent: 3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092 (diff)
21 files changed, 27 insertions, 8 deletions
diff --git a/tools/include/asm-generic/bitops/__fls.h b/tools/include/asm-generic/bitops/__fls.h
index a60a7ccb6782..03f721a8a2b1 100644
--- a/tools/include/asm-generic/bitops/__fls.h
+++ b/tools/include/asm-generic/bitops/__fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS___FLS_H_
 #define _ASM_GENERIC_BITOPS___FLS_H_
diff --git a/tools/include/asm-generic/bitops/arch_hweight.h b/tools/include/asm-generic/bitops/arch_hweight.h
index 6a211f40665c..c2705e1d220d 100644
--- a/tools/include/asm-generic/bitops/arch_hweight.h
+++ b/tools/include/asm-generic/bitops/arch_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
diff --git a/tools/include/asm-generic/bitops/const_hweight.h b/tools/include/asm-generic/bitops/const_hweight.h
index 0a7e06623470..149faeeeeaf2 100644
--- a/tools/include/asm-generic/bitops/const_hweight.h
+++ b/tools/include/asm-generic/bitops/const_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
diff --git a/tools/include/asm-generic/bitops/fls.h b/tools/include/asm-generic/bitops/fls.h
index 0576d1f42f43..753aecaab641 100644
--- a/tools/include/asm-generic/bitops/fls.h
+++ b/tools/include/asm-generic/bitops/fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS_H_
 #define _ASM_GENERIC_BITOPS_FLS_H_
diff --git a/tools/include/asm-generic/bitops/fls64.h b/tools/include/asm-generic/bitops/fls64.h
index b097cf8444e3..866f2b2304ff 100644
--- a/tools/include/asm-generic/bitops/fls64.h
+++ b/tools/include/asm-generic/bitops/fls64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_
 #define _ASM_GENERIC_BITOPS_FLS64_H_
diff --git a/tools/include/asm/export.h b/tools/include/asm/export.h
new file mode 100644
index 000000000000..2cb1a0d83035
--- /dev/null
+++ b/tools/include/asm/export.h
@@ -0,0 +1,7 @@
+#ifndef _TOOLS_ASM_EXPORT_H
+#define _TOOLS_ASM_EXPORT_H
+#define EXPORT_SYMBOL(x)
+#define EXPORT_SYMBOL_GPL(x)
+#endif /* _TOOLS_ASM_EXPORT_H */
diff --git a/tools/include/linux/hash.h b/tools/include/linux/hash.h
index 2c4183bbc504..ad6fa21d977b 100644
--- a/tools/include/linux/hash.h
+++ b/tools/include/linux/hash.h
@@ -1,4 +1,3 @@
-/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HASH_H
 #define _LINUX_HASH_H
 /* Fast hashing routine for ints,  longs and pointers.
diff --git a/tools/include/uapi/asm-generic/ioctls.h b/tools/include/uapi/asm-generic/ioctls.h
index 14baf9f23a14..040651735662 100644
--- a/tools/include/uapi/asm-generic/ioctls.h
+++ b/tools/include/uapi/asm-generic/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_IOCTLS_H
 #define __ASM_GENERIC_IOCTLS_H
diff --git a/tools/include/uapi/asm-generic/mman-common.h b/tools/include/uapi/asm-generic/mman-common.h
index 203268f9231e..6d319c46fd90 100644
--- a/tools/include/uapi/asm-generic/mman-common.h
+++ b/tools/include/uapi/asm-generic/mman-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_COMMON_H
 #define __ASM_GENERIC_MMAN_COMMON_H
diff --git a/tools/include/uapi/asm-generic/mman.h b/tools/include/uapi/asm-generic/mman.h
index f7c7b4355e56..2dffcbf705b3 100644
--- a/tools/include/uapi/asm-generic/mman.h
+++ b/tools/include/uapi/asm-generic/mman.h
@@ -1,8 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_H
 #define __ASM_GENERIC_MMAN_H
-#include <uapi/asm-generic/mman-common.h>
+#include <asm-generic/mman-common.h>
 #define MAP_GROWSDOWN   0x0100          /* stack-like segment */
 #define MAP_DENYWRITE   0x0800          /* ETXTBSY */
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index b280f37cd057..e880ae6434ee 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
 *
 * This program is free software; you can redistribute it and/or
diff --git a/tools/include/uapi/linux/bpf_common.h b/tools/include/uapi/linux/bpf_common.h
index 64ba734aba80..18be90725ab0 100644
--- a/tools/include/uapi/linux/bpf_common.h
+++ b/tools/include/uapi/linux/bpf_common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BPF_COMMON_H__
 #define _UAPI__LINUX_BPF_COMMON_H__
diff --git a/tools/include/uapi/linux/fcntl.h b/tools/include/uapi/linux/fcntl.h
index b6705247afe8..6448cdd9a350 100644
--- a/tools/include/uapi/linux/fcntl.h
+++ b/tools/include/uapi/linux/fcntl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FCNTL_H
 #define _UAPI_LINUX_FCNTL_H
diff --git a/tools/include/uapi/linux/hw_breakpoint.h b/tools/include/uapi/linux/hw_breakpoint.h
index 6394ea9d5524..965e4d8606d8 100644
--- a/tools/include/uapi/linux/hw_breakpoint.h
+++ b/tools/include/uapi/linux/hw_breakpoint.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_HW_BREAKPOINT_H
 #define _UAPI_LINUX_HW_BREAKPOINT_H
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index 838887587411..7e99999d6236 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_KVM_H
 #define __LINUX_KVM_H
diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mman.h
index 64d2b4e556e5..bfd5938fede6 100644
--- a/tools/include/uapi/linux/mman.h
+++ b/tools/include/uapi/linux/mman.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MMAN_H
 #define _UAPI_LINUX_MMAN_H
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 140ae638cfd6..362493a2f950 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 * Performance events:
 *
diff --git a/tools/include/uapi/linux/sched.h b/tools/include/uapi/linux/sched.h
index e2a6c7b3510b..30a9e51bbb1e 100644
--- a/tools/include/uapi/linux/sched.h
+++ b/tools/include/uapi/linux/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SCHED_H
 #define _UAPI_LINUX_SCHED_H
diff --git a/tools/include/uapi/linux/stat.h b/tools/include/uapi/linux/stat.h
index 9eac599afd91..7b35e98d3c58 100644
--- a/tools/include/uapi/linux/stat.h
+++ b/tools/include/uapi/linux/stat.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_STAT_H
 #define _UAPI_LINUX_STAT_H
diff --git a/tools/include/uapi/linux/vhost.h b/tools/include/uapi/linux/vhost.h
index 60180c0b5dc6..c51f8e5cc608 100644
--- a/tools/include/uapi/linux/vhost.h
+++ b/tools/include/uapi/linux/vhost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_
author	David S. Miller <davem@davemloft.net>	2017-11-09 20:00:18 -0500
committer	David S. Miller <davem@davemloft.net>	2017-11-09 20:00:18 -0500
commit	4dc6758d7824a6d25717ccceefc488cafdb07210 (patch)
tree	992e5d5996910af35a5c12fe94da14d0bb167452 /tools/include
parent	19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8 (diff)
parent	3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092 (diff)

diff --git a/tools/include/asm-generic/bitops/__fls.h b/tools/include/asm-generic/bitops/__fls.h index a60a7ccb6782..03f721a8a2b1 100644 --- a/tools/include/asm-generic/bitops/__fls.h +++ b/tools/include/asm-generic/bitops/__fls.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 */
1	#ifndef _ASM_GENERIC_BITOPS___FLS_H_	2	#ifndef _ASM_GENERIC_BITOPS___FLS_H_
2	#define _ASM_GENERIC_BITOPS___FLS_H_	3	#define _ASM_GENERIC_BITOPS___FLS_H_
3		4


diff --git a/tools/include/asm-generic/bitops/arch_hweight.h b/tools/include/asm-generic/bitops/arch_hweight.h index 6a211f40665c..c2705e1d220d 100644 --- a/tools/include/asm-generic/bitops/arch_hweight.h +++ b/tools/include/asm-generic/bitops/arch_hweight.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 */
1	#ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_	2	#ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
2	#define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_	3	#define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
3		4


diff --git a/tools/include/asm-generic/bitops/const_hweight.h b/tools/include/asm-generic/bitops/const_hweight.h index 0a7e06623470..149faeeeeaf2 100644 --- a/tools/include/asm-generic/bitops/const_hweight.h +++ b/tools/include/asm-generic/bitops/const_hweight.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 */
1	#ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_	2	#ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
2	#define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_	3	#define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
3		4


diff --git a/tools/include/asm-generic/bitops/fls.h b/tools/include/asm-generic/bitops/fls.h index 0576d1f42f43..753aecaab641 100644 --- a/tools/include/asm-generic/bitops/fls.h +++ b/tools/include/asm-generic/bitops/fls.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 */
1	#ifndef _ASM_GENERIC_BITOPS_FLS_H_	2	#ifndef _ASM_GENERIC_BITOPS_FLS_H_
2	#define _ASM_GENERIC_BITOPS_FLS_H_	3	#define _ASM_GENERIC_BITOPS_FLS_H_
3		4


diff --git a/tools/include/asm-generic/bitops/fls64.h b/tools/include/asm-generic/bitops/fls64.h index b097cf8444e3..866f2b2304ff 100644 --- a/tools/include/asm-generic/bitops/fls64.h +++ b/tools/include/asm-generic/bitops/fls64.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 */
1	#ifndef _ASM_GENERIC_BITOPS_FLS64_H_	2	#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
2	#define _ASM_GENERIC_BITOPS_FLS64_H_	3	#define _ASM_GENERIC_BITOPS_FLS64_H_
3		4


diff --git a/tools/include/asm/export.h b/tools/include/asm/export.h new file mode 100644 index 000000000000..2cb1a0d83035 --- /dev/null +++ b/tools/include/asm/export.h
@@ -0,0 +1,7 @@
		1	#ifndef _TOOLS_ASM_EXPORT_H
		2	#define _TOOLS_ASM_EXPORT_H
		3
		4	#define EXPORT_SYMBOL(x)
		5	#define EXPORT_SYMBOL_GPL(x)
		6
		7	#endif /* _TOOLS_ASM_EXPORT_H */


diff --git a/tools/include/linux/hash.h b/tools/include/linux/hash.h index 2c4183bbc504..ad6fa21d977b 100644 --- a/tools/include/linux/hash.h +++ b/tools/include/linux/hash.h
@@ -1,4 +1,3 @@
1	/* SPDX-License-Identifier: GPL-2.0 */
2	#ifndef _LINUX_HASH_H	1	#ifndef _LINUX_HASH_H
3	#define _LINUX_HASH_H	2	#define _LINUX_HASH_H
4	/* Fast hashing routine for ints, longs and pointers.	3	/* Fast hashing routine for ints, longs and pointers.


diff --git a/tools/include/uapi/asm-generic/ioctls.h b/tools/include/uapi/asm-generic/ioctls.h index 14baf9f23a14..040651735662 100644 --- a/tools/include/uapi/asm-generic/ioctls.h +++ b/tools/include/uapi/asm-generic/ioctls.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __ASM_GENERIC_IOCTLS_H	2	#ifndef __ASM_GENERIC_IOCTLS_H
2	#define __ASM_GENERIC_IOCTLS_H	3	#define __ASM_GENERIC_IOCTLS_H
3		4


diff --git a/tools/include/uapi/asm-generic/mman-common.h b/tools/include/uapi/asm-generic/mman-common.h index 203268f9231e..6d319c46fd90 100644 --- a/tools/include/uapi/asm-generic/mman-common.h +++ b/tools/include/uapi/asm-generic/mman-common.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __ASM_GENERIC_MMAN_COMMON_H	2	#ifndef __ASM_GENERIC_MMAN_COMMON_H
2	#define __ASM_GENERIC_MMAN_COMMON_H	3	#define __ASM_GENERIC_MMAN_COMMON_H
3		4


diff --git a/tools/include/uapi/asm-generic/mman.h b/tools/include/uapi/asm-generic/mman.h index f7c7b4355e56..2dffcbf705b3 100644 --- a/tools/include/uapi/asm-generic/mman.h +++ b/tools/include/uapi/asm-generic/mman.h
@@ -1,8 +1,8 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef __ASM_GENERIC_MMAN_H	2	#ifndef __ASM_GENERIC_MMAN_H
3	#define __ASM_GENERIC_MMAN_H	3	#define __ASM_GENERIC_MMAN_H
4		4
5	#include <uapi/asm-generic/mman-common.h>	5	#include <asm-generic/mman-common.h>
6		6
7	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */	7	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
8	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */	8	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */


diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index b280f37cd057..e880ae6434ee 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com	2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
2	*	3	*
3	* This program is free software; you can redistribute it and/or	4	* This program is free software; you can redistribute it and/or


diff --git a/tools/include/uapi/linux/bpf_common.h b/tools/include/uapi/linux/bpf_common.h index 64ba734aba80..18be90725ab0 100644 --- a/tools/include/uapi/linux/bpf_common.h +++ b/tools/include/uapi/linux/bpf_common.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI__LINUX_BPF_COMMON_H__	2	#ifndef _UAPI__LINUX_BPF_COMMON_H__
3	#define _UAPI__LINUX_BPF_COMMON_H__	3	#define _UAPI__LINUX_BPF_COMMON_H__
4		4


diff --git a/tools/include/uapi/linux/fcntl.h b/tools/include/uapi/linux/fcntl.h index b6705247afe8..6448cdd9a350 100644 --- a/tools/include/uapi/linux/fcntl.h +++ b/tools/include/uapi/linux/fcntl.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_FCNTL_H	2	#ifndef _UAPI_LINUX_FCNTL_H
3	#define _UAPI_LINUX_FCNTL_H	3	#define _UAPI_LINUX_FCNTL_H
4		4


diff --git a/tools/include/uapi/linux/hw_breakpoint.h b/tools/include/uapi/linux/hw_breakpoint.h index 6394ea9d5524..965e4d8606d8 100644 --- a/tools/include/uapi/linux/hw_breakpoint.h +++ b/tools/include/uapi/linux/hw_breakpoint.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_HW_BREAKPOINT_H	2	#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
3	#define _UAPI_LINUX_HW_BREAKPOINT_H	3	#define _UAPI_LINUX_HW_BREAKPOINT_H
4		4


diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 838887587411..7e99999d6236 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef __LINUX_KVM_H	2	#ifndef __LINUX_KVM_H
2	#define __LINUX_KVM_H	3	#define __LINUX_KVM_H
3		4


diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mman.h index 64d2b4e556e5..bfd5938fede6 100644 --- a/tools/include/uapi/linux/mman.h +++ b/tools/include/uapi/linux/mman.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_MMAN_H	2	#ifndef _UAPI_LINUX_MMAN_H
3	#define _UAPI_LINUX_MMAN_H	3	#define _UAPI_LINUX_MMAN_H
4		4


diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 140ae638cfd6..362493a2f950 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	/*	2	/*
2	* Performance events:	3	* Performance events:
3	*	4	*


diff --git a/tools/include/uapi/linux/sched.h b/tools/include/uapi/linux/sched.h index e2a6c7b3510b..30a9e51bbb1e 100644 --- a/tools/include/uapi/linux/sched.h +++ b/tools/include/uapi/linux/sched.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef _UAPI_LINUX_SCHED_H	2	#ifndef _UAPI_LINUX_SCHED_H
2	#define _UAPI_LINUX_SCHED_H	3	#define _UAPI_LINUX_SCHED_H
3		4


diff --git a/tools/include/uapi/linux/stat.h b/tools/include/uapi/linux/stat.h index 9eac599afd91..7b35e98d3c58 100644 --- a/tools/include/uapi/linux/stat.h +++ b/tools/include/uapi/linux/stat.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI_LINUX_STAT_H	2	#ifndef _UAPI_LINUX_STAT_H
3	#define _UAPI_LINUX_STAT_H	3	#define _UAPI_LINUX_STAT_H
4		4


diff --git a/tools/include/uapi/linux/vhost.h b/tools/include/uapi/linux/vhost.h index 60180c0b5dc6..c51f8e5cc608 100644 --- a/tools/include/uapi/linux/vhost.h +++ b/tools/include/uapi/linux/vhost.h
@@ -1,3 +1,4 @@
		1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	#ifndef _LINUX_