Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1528812229-53043-1-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1528812229-53043-1-git-send-email-pbonzini@redhat.com>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue, 12 Jun 2018 11:43:50 -0700
Message-ID: <CA+55aFxu4pD2Z8VFhojeSczb1Jf7sp9_vETvukAxFpadyj-oqw@mail.gmail.com>
Subject: Re: [GIT PULL] KVM changes for 4.18 merge window
To:     Paolo Bonzini <pbonzini@redhat.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Marc Zyngier <marc.zyngier@arm.com>,
        Dave Martin <Dave.Martin@arm.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        KVM list <kvm@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Jun 12, 2018 at 7:03 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>   git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus

Grr. Several tedious conflicts. I fixed them all up, and they all
looked trivial, but since most of them were to ARM cases, I couldn't
even test the end result.

I suspect the 'workaround_flags' could be merged into the (now)
allegedly generic 'flags' field in the arm64 kvm_vcpu_arch structure,
but I (obviously) didn't actually do that.

Adding some ARM people to the cc so that somebody on that side checks my merge.

(Still going through my basic build tests, not pushed out yet, but I'm
assuming that will finish cleanly and it should be pushed out soon).

Thanks,

              Linus