On Fri, 6 Jul 2018, KY Srinivasan wrote: > > > > The problem is that the wreckage is in Linus tree and needs to be fixed > > there, i.e. via x86/urgent. > > > > Now we have the new bits queued in x86/hyperv already which collide. So > > we > > need to merge x86/urgent into x86/hyperv after applying the fix and mop up > > the merge wreckage in x86/hyperv. > > > > I'll have a look tomorrow morning unless you beat me to it. > > I can rebase this patch against the latest tip and resend (tomorrow).
That doesn't help as we need to push the original fix to Linus ...