On Thu, Oct 27, 2016 at 09:45:27AM +0300, Dmitry Fleytman wrote: [...] > > @@ -524,7 +524,6 @@ static int e1000e_post_load(void *opaque, int > > version_id) > > E1000EState *s = opaque; > > > > trace_e1000e_cb_post_load(); > > - > > This hunk should not be in this patch.
Sorry, this is a leftover from conflict resolution when I was reordering the patches. This can be removed when committing, or I can send a new version. Jason? -- Eduardo