From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Takuya Yoshikawa <yoshikawa_takuya_b1@lab•ntt.co.jp>,
Paolo Bonzini <pbonzini@redhat•com>
Subject: linux-next: manual merge of the nvdimm tree with Linus' tree
Date: Tue, 10 Nov 2015 11:52:33 +1100 [thread overview]
Message-ID: <20151110115233.4f96c0e9@canb.auug.org.au> (raw)
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@canb•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;
next reply other threads:[~2015-11-10 0:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-10 0:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-10 1:24 linux-next: manual merge of the nvdimm tree with Linus' tree Stephen Rothwell
2015-11-10 2:42 ` Dan Williams
2015-11-10 4:50 ` Stephen Rothwell
2015-08-28 6:15 Stephen Rothwell
2015-06-20 12:38 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151110115233.4f96c0e9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=yoshikawa_takuya_b1@lab$(echo .)ntt.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox