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

Groups > linux.kernel > #1455409

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

From Linus Torvalds <torvalds@linux-foundation.org>
Newsgroups linux.kernel
Subject Re: [GIT PULL] KVM changes for 4.8 merge window
Date 2016-08-02 21:10 +0200
Message-ID <s1NeG-gB-21@gated-at.bofh.it> (permalink)
References <s1JkL-5Nl-51@gated-at.bofh.it> <s1NeG-gB-23@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

On Tue, Aug 2, 2016 at 2:02 PM, Christian Borntraeger
<borntraeger@de.ibm.com> wrote:
>
> Linus, do you use next as a tie-breaker for merge resolutions or is there
> a natural way of getting the fixups from Stephen?

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.

              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