On Tue, Jun 02, 2020 at 06:26:26PM +0200, Paolo Bonzini wrote: > On 02/06/20 15:56, Wei Liu wrote: > >> > >> between commit: > >> > >> 22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions") > >> > > Paolo > > > > As far as I can tell you merged that series a few days ago. Do you plan > > to submit it to Linus in this merge window? How do you want to proceed > > to fix the conflict? > > Hi, Linus can fix this conflict.
OK. I will write down in my pull request what needs to be done to fix the conflicts. Wei. > > Paolo >