Messages in this thread | | | Subject | Re: [PATCH v2 0/3] Per-VCPU MSR bitmaps patches - topic branch for x86/pti | From | David Woodhouse <> | Date | Mon, 29 Jan 2018 14:57:33 +0000 |
| |
On Mon, 2018-01-29 at 15:28 +0100, Paolo Bonzini wrote: > On 29/01/2018 13:53, David Woodhouse wrote: > > > > Hm, we are pushing the other bits through tip/x86/pti, which is still > > based on 4.14 so that everything can be backported easily. I was > > expecting to be able to pull a clean 4.14-based tree > > Anything 4.14-based would have had conflicts all over due to the changes > that have already gone in for tip/x86/pti. These three patches do > cherry-pick cleanly on top of 4.14. > > If you give me the tree and commit id that you want me to use as a base, > I can rebase and give you a new topic branch.
I've made a 'msr-bitmap' branch in my linux-retpoline.git tree¹ which looks more like I expected. It's based on tip/x86/pti.
In the ibpb branch (on which I've just done a pass over Karim's patches and would appreciate more feedback while he fixes up some remaining details and prepares to send it out again) I have deliberately done a merge from that branch, with the intention that I can go back and do a pull from your branch instead.
All the IBRS bits are now in the 'ibrs' branch. As discussed, I'll keep rebasing those on top of what we have, for now.
¹ http://git.infradead.org/users/dwmw2/linux-retpoline.git[unhandled content-type:application/x-pkcs7-signature]
| |