* linux-next: manual merge of the kvm tree with Linus' tree
@ 2018-08-06 5:21 Stephen Rothwell
2018-08-06 15:55 ` Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree with Linus' tree) Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-08-06 5:21 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář, KVM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree with Linus' tree)
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
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2018-08-06 15:55 UTC (permalink / raw)
To: Stephen Rothwell, Radim Krčmář, KVM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-06 15:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-06 5:21 linux-next: manual merge of the kvm tree with Linus' tree Stephen Rothwell
2018-08-06 15:55 ` Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree with Linus' tree) Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox