diff options
author | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
---|---|---|
committer | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
commit | 23da766ab1dc005860b675bf048226a11a748bf9 (patch) | |
tree | 3f8dbfc2cf68f5da3faa3a377087b06dd8ad343d /tools/testing/vsock/vsock_diag_test.c | |
parent | sched/fair: Remove sgs->sum_weighted_load (diff) | |
parent | Linux 5.2-rc5 (diff) | |
download | kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.gz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.xz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.zip |
Merge tag 'v5.2-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/vsock/vsock_diag_test.c')
-rw-r--r-- | tools/testing/vsock/vsock_diag_test.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/testing/vsock/vsock_diag_test.c b/tools/testing/vsock/vsock_diag_test.c index e896a4af52f4..c481101364a4 100644 --- a/tools/testing/vsock/vsock_diag_test.c +++ b/tools/testing/vsock/vsock_diag_test.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * vsock_diag_test - vsock_diag.ko test suite * * Copyright (C) 2017 Red Hat, Inc. * * Author: Stefan Hajnoczi <stefanha@redhat.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; version 2 - * of the License. */ #include <getopt.h> |