Received-SPF: pass (google.com: domain of linux-kernel+bounces-65777-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 14 Feb 2024 10:05:47 -0800
In-Reply-To: <CABgObfbQqVOsH0imHWc938n48TdkD8xFPO4CnwS0EM4oQZAxog@mail.gmail.com>
Precedence: bulk
Mime-Version: 1.0
References: <20240213005710.672448-1-seanjc@google.com> <CABgObfbQqVOsH0imHWc938n48TdkD8xFPO4CnwS0EM4oQZAxog@mail.gmail.com>
Message-ID: <Zc0A--vYHG77-dYn@google.com>
Subject: Re: [GIT PULL (sort of)] KVM: x86: fixes and selftests fixes/cleanups
From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Feb 14, 2024, Paolo Bonzini wrote:
> On Tue, Feb 13, 2024 at 1:57=E2=80=AFAM Sean Christopherson <seanjc@googl=
e.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 mor=
e 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?
>=20
> 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.  Tho=
ugh I
guess it all works out, so long as I make it clear that the base isn't kvm/=
master.

Thanks!