diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2019-08-23 14:08:04 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2019-08-23 14:08:04 +1000 |
| commit | 75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 (patch) | |
| tree | 1817fd08e5cf8a65e7958711c4e8b15554b4d5a2 /arch/powerpc/sysdev/xive/native.c | |
| parent | 3bda7f0ae0f786b202c0c5124c208be067acca30 (diff) | |
| parent | da15c03b047dca891d37b9f4ef9ca14d84a6484f (diff) | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in fixes for the XIVE interrupt controller which touch both
generic powerpc and PPC KVM code. To avoid merge conflicts, these
commits will go upstream via the powerpc tree as well as the KVM tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/sysdev/xive/native.c')
| -rw-r--r-- | arch/powerpc/sysdev/xive/native.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c index 7782201e5fe8..2f26b74f6cfa 100644 --- a/arch/powerpc/sysdev/xive/native.c +++ b/arch/powerpc/sysdev/xive/native.c @@ -1,10 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016,2017 IBM Corporation. - * - * 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; either version - * 2 of the License, or (at your option) any later version. */ #define pr_fmt(fmt) "xive: " fmt |