linux-next: manual merge of the akpm-current tree with the kvm tree

linux-next: manual merge of the akpm-current tree with the kvm tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/x86/kvm/mmu.c

between commits:

  7ee0e5b29d27 ("KVM: x86: MMU: Remove unused parameter of __direct_map()")
  029499b47738 ("KVM: x86: MMU: Make mmu_set_spte() return emulate value")

from the kvm tree and commit:

  7fd3f3e7c320 ("kvm: rename pfn_t to kvm_pfn_t")

from the akpm-current 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 a1a3d1907fdc,2dd83650d867..000000000000
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@@ -2546,9 -2564,10 +2546,9 @@@ done
  	return ret;
  }
  
 -static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
 -			 unsigned pte_access, int write_fault, int *emulate,
 -			 int level, gfn_t gfn, kvm_pfn_t pfn, bool speculative,
 -			 bool host_writable)
 +static bool mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, unsigned pte_access,
- 			 int write_fault, int level, gfn_t gfn, pfn_t pfn,
++			 int write_fault, int level, gfn_t gfn, kvm_pfn_t pfn,
 +			 bool speculative, bool host_writable)
  {
  	int was_rmapped = 0;
  	int rmap_count;
@@@ -2606,11 -2624,9 +2606,11 @@@
  	}
  
  	kvm_release_pfn_clean(pfn);
 +
 +	return emulate;
  }
  
- static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
+ static kvm_pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
  				     bool no_dirty_log)
  {
  	struct kvm_memory_slot *slot;
@@@ -2691,8 -2708,9 +2691,8 @@@ static void direct_pte_prefetch(struct 
  	__direct_pte_prefetch(vcpu, sp, sptep);
  }
  
 -static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
 -			int map_writable, int level, gfn_t gfn, kvm_pfn_t pfn,
 -			bool prefault)
 +static int __direct_map(struct kvm_vcpu *vcpu, int write, int map_writable,
- 			int level, gfn_t gfn, pfn_t pfn, bool prefault)
++			int level, gfn_t gfn, kvm_pfn_t pfn, bool prefault)
  {
  	struct kvm_shadow_walk_iterator iterator;
  	struct kvm_mmu_page *sp;

Re: linux-next: manual merge of the akpm-current tree with the kvm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

Hi Andrew,

On Wed, 6 Feb 2013 22:23:57 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> hm, not sure what you meant by "bad" but that patch went and took the
> nice fits-in-80-cols kvm code and mucked it all up.  Shall unmuck
> tomorrow.

"bad" in the sense that there was lots of white space changes to lines
not otherwise touched by the patch and those white space changes
introduced extra levels of tabs (so the indentation was incorrect) and
merged some lines.  I unmucked some of it, but got bored :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the akpm-current tree with the kvm tree

[Andrew Morton]

On Thu, 7 Feb 2013 17:03:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> arch/x86/kvm/mmu.c between commit 9bb4f6b15ec0 ("KVM: MMU: drop unneeded
> checks") from the kvm tree and commit "hlist: drop the node parameter
> from iterators" from the akpm-current tree.
> 
> I fixed it up (the conflicts were caused by bad white space changes in
> the akpm tree patch) and can carry the fix as necessary (no action is
> required).

hm, not sure what you meant by "bad" but that patch went and took the
nice fits-in-80-cols kvm code and mucked it all up.  Shall unmuck
tomorrow.

linux-next: manual merge of the akpm-current tree with the kvm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/kvm/mmu.c between commit 9bb4f6b15ec0 ("KVM: MMU: drop unneeded
checks") from the kvm tree and commit "hlist: drop the node parameter
from iterators" from the akpm-current tree.

I fixed it up (the conflicts were caused by bad white space changes in
the akpm tree patch) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]