From: Paolo Bonzini <pbonzini@redhat•com>
To: "Stephen Rothwell" <sfr@canb•auug.org.au>,
"Radim Krčmář" <rkrcmar@redhat•com>, KVM <kvm@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree with Linus' tree)
Date: Mon, 6 Aug 2018 17:55:29 +0200 [thread overview]
Message-ID: <af02fe54-5110-8ceb-e741-675562de8c0d@redhat.com> (raw)
In-Reply-To: <20180806152100.05589155@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 882 bytes --]
On 06/08/2018 07:21, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/kvm/vmx.c
>
> between a series of commits in Linus' tree and a series of commits in
> the kvm tree.
>
> I have no idea how to fix all this up, so I just dropped all the changes
> from Linus' tree (all those commits only touched this file). Please do
> this merge your self or provide me (and Linus) with the necessary
> resolution.
The conflicts are indeed very nasty, so I'm going to rebase the top of
kvm/next and insert a merge from Linus's tree (4.18-rc6 to be precise).
The reason is that some changes were split between 4.18 and 4.19, and
therefore there are conflicts between bugfixes and new development.
They should have been handled by merging kvm/master into kvm/next, but
it's too late for that.
Paolo
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2018-08-06 15:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 5:21 linux-next: manual merge of the kvm tree with Linus' tree Stephen Rothwell
2018-08-06 15:55 ` Paolo Bonzini [this message]
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=af02fe54-5110-8ceb-e741-675562de8c0d@redhat.com \
--to=pbonzini@redhat$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rkrcmar@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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