Skip to contentSkip to conversation

KVM fixes for 3.10-rc2

GIT PULL Gleb Natapov 2 participants 4 messages May 23, 2013 KVM

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull from

git://git.kernel.org/pub/scm/virt/kvm/kvm.git master

To receive the following KVM bug fixes

Paolo Bonzini (1):
KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry

Sanjay Lal (2):
KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API. KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()

 MAINTAINERS                      |    7 ++--
 arch/mips/include/asm/kvm.h      |   55 ---------------------------------------
 arch/mips/include/uapi/asm/kvm.h |   55 +++++++++++++++++++++++++++++++++++++++
 arch/mips/kvm/kvm_tlb.c          |   35 ++++++++++++++++++------
 4 files changed, 85 insertions(+), 67 deletions(-)

--
Gleb.

#1 lore raw
Quoted 6 lines · Gleb Natapov
 MAINTAINERS                      |    7 ++--
 arch/mips/include/asm/kvm.h      |   55 ---------------------------------------
 arch/mips/include/uapi/asm/kvm.h |   55 +++++++++++++++++++++++++++++++++++++++
 arch/mips/kvm/kvm_tlb.c          |   35 ++++++++++++++++++------
 4 files changed, 85 insertions(+), 67 deletions(-)

This was wrong. Please make sure you use the "-M" flag to make git diff look for file renames, and the "--summary" flag to show metadata changes separately.

IOW, it *should* have looked like this:

 MAINTAINERS                            |  7 ++++---
 arch/mips/include/{ => uapi}/asm/kvm.h |  0
 arch/mips/kvm/kvm_tlb.c                | 35 ++++++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)
 rename arch/mips/include/{ => uapi}/asm/kvm.h (100%)

Thanks,

Linus

#2 lore raw
Quoted 12 lines · Linus Torvalds
Quoted 6 lines · Gleb Natapov
 MAINTAINERS                      |    7 ++--
 arch/mips/include/asm/kvm.h      |   55 ---------------------------------------
 arch/mips/include/uapi/asm/kvm.h |   55 +++++++++++++++++++++++++++++++++++++++
 arch/mips/kvm/kvm_tlb.c          |   35 ++++++++++++++++++------
 4 files changed, 85 insertions(+), 67 deletions(-)

This was wrong. Please make sure you use the "-M" flag to make git diff look for file renames, and the "--summary" flag to show metadata changes separately.

Quoted 8 lines

IOW, it *should* have looked like this:

 MAINTAINERS                            |  7 ++++---
 arch/mips/include/{ => uapi}/asm/kvm.h |  0
 arch/mips/kvm/kvm_tlb.c                | 35 ++++++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)
 rename arch/mips/include/{ => uapi}/asm/kvm.h (100%)

Ugh, yes "-M" and "--summary" were missing. I updated the script now. Thanks! Should I regenerate pull request?

--
Gleb.

#3 lore raw
Quoted 3 lines · Gleb Natapov

Ugh, yes "-M" and "--summary" were missing. I updated the script now. Thanks! Should I regenerate pull request?

No, I pulled,

Linus