lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 10 Nov 2015 11:52:33 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Dan Williams <dan.j.williams@...el.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Takuya Yoshikawa <yoshikawa_takuya_b1@....ntt.co.jp>, Paolo Bonzini <pbonzini@...hat.com> Subject: linux-next: manual merge of the nvdimm tree with Linus' tree Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: arch/x86/kvm/mmu.c between commit: cd1872f02855 ("KVM: x86: MMU: Make force_pt_level bool") fd1369021878 ("KVM: x86: MMU: Move mapping_level_dirty_bitmap() call in mapping_level()") from Linus' tree and commit: 8ddcb353467a ("kvm: rename pfn_t to kvm_pfn_t") from the nvdimm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc arch/x86/kvm/mmu.c index 7d85bcae3332,6ab963ae0427..000000000000 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@@ -2982,8 -2963,8 +2983,8 @@@ static int nonpaging_map(struct kvm_vcp { int r; int level; - int force_pt_level; + bool force_pt_level = false; - pfn_t pfn; + kvm_pfn_t pfn; unsigned long mmu_seq; bool map_writable, write = error_code & PFERR_WRITE_MASK; @@@ -3491,10 -3474,10 +3492,10 @@@ check_hugepage_cache_consistency(struc static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code, bool prefault) { - pfn_t pfn; + kvm_pfn_t pfn; int r; int level; - int force_pt_level; + bool force_pt_level; gfn_t gfn = gpa >> PAGE_SHIFT; unsigned long mmu_seq; int write = error_code & PFERR_WRITE_MASK; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists