Merge branch 'kvm-vmx-secctl' into HEAD (c3e9434c) · Commits · Librem5 / linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

Admin message

source.puri.sm migrated to a new server, see new ssh key fingerprint.

c3e9434c

Commit c3e9434c authored 3 years ago by Paolo Bonzini

Downloads
- Plain Diff

Merge branch 'kvm-vmx-secctl' into HEAD

Merge common topic branch for 5.14-rc6 and 5.15 merge window.

parents 32bdc019 7b9cae02

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kvm/hyperv.c 14 additions, 4 deletions

arch/x86/kvm/hyperv.c
arch/x86/kvm/mmu/mmu.c 1 addition, 1 deletion

arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/svm/sev.c 25 additions, 20 deletions

arch/x86/kvm/svm/sev.c
arch/x86/kvm/trace.h 15 additions, 0 deletions

arch/x86/kvm/trace.h
arch/x86/kvm/vmx/vmx.h 1 addition, 1 deletion

arch/x86/kvm/vmx/vmx.h
tools/testing/selftests/kvm/include/x86_64/hyperv.h 4 additions, 1 deletion

tools/testing/selftests/kvm/include/x86_64/hyperv.h
tools/testing/selftests/kvm/x86_64/hyperv_clock.c 1 addition, 1 deletion

tools/testing/selftests/kvm/x86_64/hyperv_clock.c
tools/testing/selftests/kvm/x86_64/hyperv_features.c 38 additions, 3 deletions

tools/testing/selftests/kvm/x86_64/hyperv_features.c
virt/kvm/kvm_main.c 16 additions, 2 deletions

virt/kvm/kvm_main.c

with 115 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment