diff options
author | 2017-11-07 10:53:06 +0100 | |
---|---|---|
committer | 2017-11-07 10:53:06 +0100 | |
commit | b3d9a136815ca9284ade2a897a3b7d2b0084c33c (patch) | |
tree | af222e53d833ff7218577cf98e1b856d9d6bda93 /tools/virtio/vringh_test.c | |
parent | x86/mm: Define _PAGE_TABLE using _KERNPG_TABLE (diff) | |
parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
download | linux-dev-b3d9a136815ca9284ade2a897a3b7d2b0084c33c.tar.xz linux-dev-b3d9a136815ca9284ade2a897a3b7d2b0084c33c.zip |
Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/virtio/vringh_test.c')
-rw-r--r-- | tools/virtio/vringh_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c index 9476c616d064..293653463303 100644 --- a/tools/virtio/vringh_test.c +++ b/tools/virtio/vringh_test.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* Simple test of virtio code, entirely in userpsace. */ #define _GNU_SOURCE #include <sched.h> |