From: Paolo Bonzini <pbonzini@redhat.com>
To: "Radim Krčmář" <rkrcmar@redhat.com>,
"Linus Torvalds" <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [GIT PULL] KVM updates for Linux 4.20-rc1
Date: Wed, 24 Oct 2018 23:44:43 +0200 [thread overview]
Message-ID: <b75a43e2-1546-3956-361f-f72e76b54f3d@redhat.com> (raw)
In-Reply-To: <20181024111410.GA2221@potion.hotspot.internet-for-guests.com>
On 24/10/2018 13:14, Radim Krčmář wrote:
> Linus,
>
> there are conflicts with the ARM tree as we didn't have a topic branch and some
> with 4.19 fixes. Future merge of the selftests tree will also have a conflict,
> https://lkml.org/lkml/2018/10/18/273. All should be resolved as in next and
> a resolution of the first two is attached at the bottom.
FWIW, for the selftests tree you should just keep the version from the
KVM tree.
Thanks,
Paolo
next prev parent reply other threads:[~2018-10-24 21:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 11:14 [GIT PULL] KVM updates for Linux 4.20-rc1 Radim Krčmář
2018-10-24 21:44 ` Paolo Bonzini [this message]
2018-10-26 1:00 ` Linus Torvalds
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=b75a43e2-1546-3956-361f-f72e76b54f3d@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;
as well as URLs for NNTP newsgroup(s).