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

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 com

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

Hi Andrew, On Wed, 6 Feb 2013 22:23:57 -0800 Andrew Morton 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

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

On Thu, 7 Feb 2013 17:03:19 +1100 Stephen Rothwell 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 > fro

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

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 we