Re: [GIT PULL] KVM fixes for 3.10-rc2

[Linus Torvalds]

On Thu, May 23, 2013 at 3:41 AM, Gleb Natapov <gleb@xxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/