From: Paolo Bonzini <pbonzini@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"KVM list" <kvm@vger.kernel.org>
Subject: Re: [GIT PULL] KVM patches for Linux 5.4-rc8
Date: Tue, 12 Nov 2019 22:33:12 +0100 [thread overview]
Message-ID: <b21e7ce6-6151-87dd-9d20-e39b788d523e@redhat.com> (raw)
In-Reply-To: <CAHk-=wibywR7ySaBD=H9Q0cc1d86+Z1Sg3OWUsDjUvj21dZAKQ@mail.gmail.com>
On 12/11/19 22:26, Linus Torvalds wrote:
>> It's not a particularly hard conflict, but I'm including anyway a
>> resolution at the end of this email.
> Hmm. My resolution has a slightly different conflict diff, that shows
> another earlier part (that git ended up sorting out itself - maybe you
> edited it out for that reason).
Yes, I edited it out to point out the one that matters. Sorry for the
confusion.
Paolo
> I think I did the right conflict resolution, but the difference in
> diffs makes me just slightly nervous. Mind checking it?
next prev parent reply other threads:[~2019-11-12 21:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 21:10 Paolo Bonzini
2019-11-12 21:26 ` Linus Torvalds
2019-11-12 21:33 ` Paolo Bonzini [this message]
2019-11-12 21:30 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b21e7ce6-6151-87dd-9d20-e39b788d523e@redhat.com \
--to=pbonzini@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rkrcmar@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®