diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
commit | 4d012040161cba054208555300d9fdf2b8925c34 (patch) | |
tree | 326f597177a377bc17b98e5e77d242a0ba4b042c /arch/riscv/kvm/vcpu.c | |
parent | c4bc515d73b5201d30f78b935accdd9e3988f05e (diff) | |
parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) |
Merge 5.16-rc3 into usb-next
We need the USB driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/riscv/kvm/vcpu.c')
-rw-r--r-- | arch/riscv/kvm/vcpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index e3d3aed46184..fb84619df012 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -740,7 +740,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) * Ensure we set mode to IN_GUEST_MODE after we disable * interrupts and before the final VCPU requests check. * See the comment in kvm_vcpu_exiting_guest_mode() and - * Documentation/virtual/kvm/vcpu-requests.rst + * Documentation/virt/kvm/vcpu-requests.rst */ vcpu->mode = IN_GUEST_MODE; |