Re: [GIT PULL] First batch of KVM changes for 5.6 merge window

[Paolo Bonzini]

On 31/01/20 22:24, Borislav Petkov wrote:
>> I was supposed to get a topic branch and fix everything up so that both
>> CPU_BASED_ and VMX_FEATURE_ constants would get the new naming.  When
>> Boris alerted me of the conflict and I said "thanks I'll sort it out",
>> he probably interpreted it as me not needing the topic branch anymore.
>> I then forgot to remind him, and here we are.
>
> Damn, that was a misunderstanding. I actually had a topic branch:
> tip:x86/cpu and was assuming that you'll see it from the tip-bot
> notifications. But they went to lkml and you weren't CCed. And
> regardless, I should've told you explicitly which one it is, sorry about
> that. I'll be more explicit next time.

No problem, it's fair to say that we both did our best to mess this up. :)

Paolo