diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:57:24 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:57:24 +0100 |
commit | 31fe3cbbf26772ad83d2800dcb001f3dae92692e (patch) | |
tree | b56d8a61ff4fb4f44881637aa236d09860e5c63b /drivers/vfio/pci/trace.h | |
parent | 0365aeba50841e087b3d6a0eca1bddccc5e650c8 (diff) | |
parent | 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 (diff) | |
download | talos-op-linux-31fe3cbbf26772ad83d2800dcb001f3dae92692e.tar.gz talos-op-linux-31fe3cbbf26772ad83d2800dcb001f3dae92692e.zip |
Merge tag 'v5.0-rc5' into locking/core to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/vfio/pci/trace.h')
-rw-r--r-- | drivers/vfio/pci/trace.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/vfio/pci/trace.h b/drivers/vfio/pci/trace.h index 4d13e510590e..b2aa986ab9ed 100644 --- a/drivers/vfio/pci/trace.h +++ b/drivers/vfio/pci/trace.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * VFIO PCI mmap/mmap_fault tracepoints * * Copyright (C) 2018 IBM Corp. All rights reserved. * Author: Alexey Kardashevskiy <aik@ozlabs.ru> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #undef TRACE_SYSTEM |