Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-13 Thread Linus Torvalds
On Wed, Dec 12, 2012 at 1:19 PM, Stephen Rothwell s...@canb.auug.org.au wrote:

 There is a section of this tree (the kvm-ppc tree in linux-next) that has
 been rebased before being merged into this tree.   Alexander, please
 don't do that (especially since it has *not* bee rebased in the kvm-ppc
 tree but more work has been added on top of it :-().

Christ, why can't people learn?

Solution: I'm not pulling this, if it means that we will have
duplicate commits somewhere.

  Linus
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-13 Thread Stephen Rothwell
Hi Linus,

On Thu, 13 Dec 2012 14:22:34 -0800 Linus Torvalds 
torva...@linux-foundation.org wrote:

 On Wed, Dec 12, 2012 at 1:19 PM, Stephen Rothwell s...@canb.auug.org.au 
 wrote:
 
  There is a section of this tree (the kvm-ppc tree in linux-next) that has
  been rebased before being merged into this tree.   Alexander, please
  don't do that (especially since it has *not* bee rebased in the kvm-ppc
  tree but more work has been added on top of it :-().
 
 Christ, why can't people learn?
 
 Solution: I'm not pulling this, if it means that we will have
 duplicate commits somewhere.

Actually only in my tree (until Alexander cleans his tree up).  I am
going to have a conversation with Alexander about process.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpbS0YZJpZBa.pgp
Description: PGP signature


Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-13 Thread Linus Torvalds
On Thu, Dec 13, 2012 at 3:03 PM, Stephen Rothwell s...@canb.auug.org.au wrote:

 Actually only in my tree (until Alexander cleans his tree up).  I am
 going to have a conversation with Alexander about process.

Ok, as long as it's contained, I guess I'll pull.

Linus
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-12 Thread Stephen Rothwell
Hi Marcello, Alexander,

On Wed, 12 Dec 2012 10:35:19 -0200 Marcelo Tosatti mtosa...@redhat.com wrote:

 Please pull from
 
 git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.8-1 
 
 to receive the KVM updates for the 3.8 merge window, including
 considerable KVM/PPC work, x86 kvmclock vsyscall support, IA32_TSC_ADJUST
 MSR emulation, amongst others.

There is a section of this tree (the kvm-ppc tree in linux-next) that has
been rebased before being merged into this tree.   Alexander, please
don't do that (especially since it has *not* bee rebased in the kvm-ppc
tree but more work has been added on top of it :-().

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpHnXbejFQ3v.pgp
Description: PGP signature