On 9/17/19 10:32 PM, Richard Henderson wrote: > On 9/16/19 11:48 AM, Philippe Mathieu-Daudé wrote: >> include/hw/rtc/mc146818rtc.h | 38 ++++++++++++++++++++ > > Same rebase failure as for patch 4?
This one is actually correct, it got moved from: include/hw/timer/mc146818rtc.h | 14 -------- The difference is the addition of missing copyright/license.