On Wed, Feb 14, 2024, Paolo Bonzini wrote: > On Tue, Feb 13, 2024 at 1:57 AM Sean Christopherson <seanjc@xxxxxxxxxx> 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!
