Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1455453

Re: [GIT PULL] KVM changes for 4.8 merge window

Show all headers | View raw

On Tue, Aug 2, 2016 at 2:42 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> No, I don't use the merge from linux-next directly. I just re-generate
> the merge myself, and if the pull request then includes a merge
> resolution (either as just a verbal description, or a patch or by
> having a separate "merged" test-branch), I will compare my merge with
> that one.

Ok, the KVM merge was indeed the most painful one this merge window so
far. Which isn't saying all that much, since this merge window has so
far been pretty good (knock wood).

Let's see if I got everything right. I did pick up the fixup patch
from Sudip and made it part of the merge, so that hopefully it's all
complete and also bisectable.

Please do check it out. And let's hope the KVM people have learnt
their lesson and we won't have these messy merges in the future.

          Linus

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] KVM changes for 4.8 merge window Paolo Bonzini <pbonzini@redhat.com> - 2016-08-02 17:00 +0200
  Re: [GIT PULL] KVM changes for 4.8 merge window Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 21:10 +0200
    Re: [GIT PULL] KVM changes for 4.8 merge window Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 22:40 +0200
      Re: [GIT PULL] KVM changes for 4.8 merge window Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 23:50 +0200
      Re: [GIT PULL] KVM changes for 4.8 merge window Christian Borntraeger <borntraeger@de.ibm.com> - 2016-08-03 02:20 +0200
      Re: [GIT PULL] KVM changes for 4.8 merge window Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-08-03 05:00 +0200
  Re: [GIT PULL] KVM changes for 4.8 merge window Paolo Bonzini <pbonzini@redhat.com> - 2016-08-02 21:20 +0200
  Re: [GIT PULL] KVM changes for 4.8 merge window Christian Borntraeger <borntraeger@de.ibm.com> - 2016-08-02 23:40 +0200
  Re: [GIT PULL] KVM changes for 4.8 merge window Michael Ellerman <mpe@ellerman.id.au> - 2016-08-03 06:00 +0200
    Re: [GIT PULL] KVM changes for 4.8 merge window Paolo Bonzini <pbonzini@redhat.com> - 2016-08-03 08:50 +0200
      Re: [GIT PULL] KVM changes for 4.8 merge window Michael Ellerman <mpe@ellerman.id.au> - 2016-08-03 08:50 +0200
        Re: [GIT PULL] KVM changes for 4.8 merge window Paolo Bonzini <pbonzini@redhat.com> - 2016-08-03 13:10 +0200

csiph-web