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. Thanks, Paolo > which you had > *also* pulled into the latest kvm.git and resolved any merge issues... > but I just pulled a whole bunch of unrelated post-4.14 changes into my > working tree. > > How do you want to handle this?
