Re: [Qemu-devel] State of EHCI emulation for QEMU

[Jan Kiszka]

Am 08.12.2010 09:26, Gerd Hoffmann wrote:
>   Hi,
> 
>> It appears that the import of the ehci code to spice has completely lost
>> the development history and code contributions - from the original
>> version by Mark Burkley through the work I've done on it. Would you mind
>> pulling in the patch history instead of just the final code?
> 
> I've first tried to rebase the ehci branch to latest master exactly to
> keep the history.  Was quite messy with lots of conflicts though, so I
> gave up.  For review & upstream merge having the whole history isn't
> that helpful anyway.

I'm was regularly merging master into ehci, and that worked quite well.
For the development phase, it might be nice to keep the history if
possible. But I agree that we need a clean series once upstream
submission is in sight.

Jan

signature.asc
Description: OpenPGP digital signature