diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
| commit | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e (patch) | |
| tree | c863dd43c84579d853f3a2ae0ee6ead46c967703 /drivers/ata/libata-trace.c | |
| parent | 66f61c92889ff3ca365161fb29dd36d6354682ba (diff) | |
| parent | d724c9e54939a597592de3659541da11fc7aa112 (diff) | |
Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
PPC KVM fixes for 5.2
- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.
Diffstat (limited to 'drivers/ata/libata-trace.c')
| -rw-r--r-- | drivers/ata/libata-trace.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/ata/libata-trace.c b/drivers/ata/libata-trace.c index f8c550df0615..08e001303a82 100644 --- a/drivers/ata/libata-trace.c +++ b/drivers/ata/libata-trace.c | |||
| @@ -1,22 +1,9 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * libata-trace.c - trace functions for libata | 3 | * libata-trace.c - trace functions for libata |
| 3 | * | 4 | * |
| 4 | * Copyright 2015 Hannes Reinecke | 5 | * Copyright 2015 Hannes Reinecke |
| 5 | * Copyright 2015 SUSE Linux GmbH | 6 | * Copyright 2015 SUSE Linux GmbH |
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2, or (at your option) | ||
| 10 | * any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; see the file COPYING. If not, write to | ||
| 19 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 20 | */ | 7 | */ |
| 21 | 8 | ||
| 22 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
