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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 2 Aug 2016 14:42:01 -0400
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Christian Borntraeger <borntraeger@...ibm.com>
Cc:	Paolo Bonzini <pbonzini@...hat.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Radim Krčmář <rkrcmar@...hat.com>,
	KVM list <kvm@...r.kernel.org>,
	Christoffer Dall <christoffer.dall@...aro.org>,
	Dan Williams <dan.j.williams@...el.com>,
	Marc Zyngier <marc.zyngier@....com>,
	Paul Mackerras <paulus@...abs.org>,
	Michael Ellerman <mpe@...erman.id.au>,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: Re: [GIT PULL] KVM changes for 4.8 merge window

On Tue, Aug 2, 2016 at 2:02 PM, Christian Borntraeger
<borntraeger@...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