mbox

[GIT,PULL,0/2] KVM/ARM Fixes for 3.19

Message ID 1420981811-18731-1-git-send-email-christoffer.dall@linaro.org
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvm-arm-fixes-3.19

Message

Christoffer Dall Jan. 11, 2015, 1:10 p.m. UTC
Hi Paolo,

The following changes since commit b1940cd21c0f4abdce101253e860feff547291b0:

  Linux 3.19-rc3 (2015-01-05 17:05:20 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvm-arm-fixes-3.19

for you to fetch changes up to b5b8ddba844c6b6c5b96c27b284d9ed05a16fa13:

  arm64: KVM: Fix HCR setting for 32bit guests (2015-01-11 13:54:51 +0100)

(Note that I got an extra merge commit when merging kvm/master into
kvmarm/master, which I think is because Linus applied the set of fixes
from kvmarm/master directly from Marc's patches. Let me know if you need
me to mangle this differently somehow.)

Thanks,
-Christoffer

----------------------------------------------------------------
Fixes for KVM/ARM for 3.19 addressing TLB invalidation issues and 32-bit guest
regression.

----------------------------------------------------------------
Marc Zyngier (2):
      arm64: KVM: Fix TLB invalidation by IPA/VMID
      arm64: KVM: Fix HCR setting for 32bit guests

 arch/arm64/include/asm/kvm_emulate.h | 2 ++
 arch/arm64/kvm/hyp.S                 | 1 +
 arch/arm64/kvm/reset.c               | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

Comments

Christoffer Dall Jan. 12, 2015, 5:19 p.m. UTC | #1
On Mon, Jan 12, 2015 at 11:15:00AM +0100, Paolo Bonzini wrote:
> 
> 
> On 11/01/2015 14:10, Christoffer Dall wrote:
> > Hi Paolo,
> > 
> > The following changes since commit b1940cd21c0f4abdce101253e860feff547291b0:
> > 
> >   Linux 3.19-rc3 (2015-01-05 17:05:20 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvm-arm-fixes-3.19
> > 
> > for you to fetch changes up to b5b8ddba844c6b6c5b96c27b284d9ed05a16fa13:
> > 
> >   arm64: KVM: Fix HCR setting for 32bit guests (2015-01-11 13:54:51 +0100)
> > 
> > (Note that I got an extra merge commit when merging kvm/master into
> > kvmarm/master, which I think is because Linus applied the set of fixes
> > from kvmarm/master directly from Marc's patches. Let me know if you need
> > me to mangle this differently somehow.)
> 
> Hmm, that's a bit ugly.  I'll apply the patches directly too, please do
> a "git reset --hard kvm/master" before applying more stuff.
> 
ok, we did try to (and say publicly) that we'd keep kvmarm/master a
stable branch (like it also says about kvm/master on the KVM wiki), so
that's why I did this.

I guess we can just require people that follow kvmarm/master (if any) to
deal with things accordingly.

-Christoffer
Christoffer Dall Jan. 12, 2015, 6:47 p.m. UTC | #2
On Mon, Jan 12, 2015 at 07:36:14PM +0100, Paolo Bonzini wrote:
> 
> 
> On 12/01/2015 18:19, Christoffer Dall wrote:
> >> > Hmm, that's a bit ugly.  I'll apply the patches directly too, please do
> >> > a "git reset --hard kvm/master" before applying more stuff.
> >> > 
> > ok, we did try to (and say publicly) that we'd keep kvmarm/master a
> > stable branch (like it also says about kvm/master on the KVM wiki), so
> > that's why I did this.
> > 
> > I guess we can just require people that follow kvmarm/master (if any) to
> > deal with things accordingly.
> 
> Yeah, I agree that this shouldn't have happened.
> 
> It's not the end of the world.  People that pull from kvmarm/master will
> almost always rebase their trees, and the rebase will discard the
> duplicate patches.
> 
> The big problem with rebasing happens if you _drop_ patches.  In that
> case, whoever rebases will keep the patch that you dropped, and most
> likely will not notice.
> 
That's a good point.  And I don't think anyone directly integrates the
kvmarm/master branch into anything anyway.

I will reset the branch.


Thanks,
-Christoffer