Messages in this thread | | | Date | Thu, 1 Feb 2018 16:22:44 +0100 | From | Radim Krčmář <> | Subject | Re: linux-next: manual merge of the kvm tree with Linus' tree |
| |
2018-02-01 09:21-0500, Paolo Bonzini: > On 01/02/2018 08:22, Stephen Rothwell wrote: > > Hi Christoffer, > > > > On Thu, 1 Feb 2018 11:47:07 +0100 Christoffer Dall <christoffer.dall@linaro.org> wrote: > >> > >> While the suggested fix is functional it does result in some code > >> duplication, and the better resolution is the following: > > > > OK, I will use that resolution form tomorrow on. > > > > Someone needs to remember to let Linus know when the pull request is > > sent. > > It should be fixed in the KVM tree before it reaches Linus (when we > merge a topic branch that is common between x86/pti & KVM).
I wasn't sure if the pti top branch is final, so I pulled hyper-v topic branch that also also contains v4.15. This and the SEV feature conflicts should be gone now,
thanks.
| |