linux-kernel - Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree with Linus' tree)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <af02fe54-5110-8ceb-e741-675562de8c0d@redhat.com>
Date:   Mon, 6 Aug 2018 17:55:29 +0200
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Radim Krčmář <rkrcmar@...hat.com>,
        KVM <kvm@...r.kernel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Rebasing kvm/next (was Re: linux-next: manual merge of the kvm tree
 with Linus' tree)

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



Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)