linux-kernel - Re: [GIT PULL (sort of)] KVM: x86: fixes and selftests fixes/cleanups

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] [day] [month] [year] [list]

Message-ID: <Zc0A--vYHG77-dYn@google.com>
Date: Wed, 14 Feb 2024 10:05:47 -0800
From: Sean Christopherson <seanjc@...gle.com>
To: Paolo Bonzini <pbonzini@...hat.com>
Cc: kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL (sort of)] KVM: x86: fixes and selftests fixes/cleanups

On Wed, Feb 14, 2024, Paolo Bonzini wrote:
> On Tue, Feb 13, 2024 at 1:57 AM Sean Christopherson <seanjc@...gle.com> wrote:
> >
> > I have two pull requests for 6.8, but I goofed (or maybe raced with you
> > pushing to kvm/master), and based everything on 6.8-rc2 instead of 6.8-rc1 as
> > you did.  And so of course the pull requests would bring in waaaaay more than
> > just the intended KVM changes.
> >
> > Can I bribe you to do a back merge of 6.8-rc2, so that my pull requests don't
> > make me look like a complete idiot?
> 
> Ignoring the fact that kvm/master is currently a subset of Linus's
> tree (so I can just fast forward to -rc4 before merging your stuff),
> that's absolutely not a problem and it happens all the time during the
> merge window. The way to handle that is to forge the diffstat in the
> pull request, replacing it with the diffstat of the test merge commit
> that I do anyway. It's a known issue with git-request-pull and pretty
> much all maintainers do it.

Heh, I did that locally, but sending out a forged diffstat felt dirty.  Though I
guess it all works out, so long as I make it clear that the base isn't kvm/master.

Thanks!