* [GIT PULL] KVM fixes for 3.10-rc2
@ 2013-05-23 10:41 Gleb Natapov
2013-05-23 16:20 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Gleb Natapov @ 2013-05-23 10:41 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, kvm, Marcelo Tosatti, pbonzini
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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] KVM fixes for 3.10-rc2
2013-05-23 10:41 [GIT PULL] KVM fixes for 3.10-rc2 Gleb Natapov
@ 2013-05-23 16:20 ` Linus Torvalds
2013-05-23 17:13 ` Gleb Natapov
0 siblings, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2013-05-23 16:20 UTC (permalink / raw)
To: Gleb Natapov; +Cc: linux-kernel, kvm, Marcelo Tosatti, Paolo Bonzini
On Thu, May 23, 2013 at 3:41 AM, Gleb Natapov <gleb@redhat.com> wrote:
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] KVM fixes for 3.10-rc2
2013-05-23 16:20 ` Linus Torvalds
@ 2013-05-23 17:13 ` Gleb Natapov
2013-05-23 17:14 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Gleb Natapov @ 2013-05-23 17:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, kvm, Marcelo Tosatti, Paolo Bonzini
On Thu, May 23, 2013 at 09:20:22AM -0700, Linus Torvalds wrote:
> On Thu, May 23, 2013 at 3:41 AM, Gleb Natapov <gleb@redhat.com> wrote:
> >
> > 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%)
>
Ugh, yes "-M" and "--summary" were missing. I updated the script now. Thanks!
Should I regenerate pull request?
--
Gleb.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] KVM fixes for 3.10-rc2
2013-05-23 17:13 ` Gleb Natapov
@ 2013-05-23 17:14 ` Linus Torvalds
0 siblings, 0 replies; 4+ messages in thread
From: Linus Torvalds @ 2013-05-23 17:14 UTC (permalink / raw)
To: Gleb Natapov; +Cc: linux-kernel, kvm, Marcelo Tosatti, Paolo Bonzini
On Thu, May 23, 2013 at 10:13 AM, Gleb Natapov <gleb@redhat.com> wrote:
>
> Ugh, yes "-M" and "--summary" were missing. I updated the script now. Thanks!
> Should I regenerate pull request?
No, I pulled,
Linus
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-23 17:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-23 10:41 [GIT PULL] KVM fixes for 3.10-rc2 Gleb Natapov
2013-05-23 16:20 ` Linus Torvalds
2013-05-23 17:13 ` Gleb Natapov
2013-05-23 17:14 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox