On Tue, Feb 11, 2014 at 08:52:11PM +0100, Andreas Färber wrote: > Edgar, > > Am 03.02.2014 10:44, schrieb Edgar E. Iglesias: > > From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com> > > > > Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com> > > --- > > cpus.c | 2 ++ > > cputlb.c | 7 ++++--- > > exec.c | 27 +++++++++++++++++++-------- > > include/exec/exec-all.h | 1 + > > include/exec/softmmu_template.h | 6 ++++-- > > include/qom/cpu.h | 3 +++ > > 6 files changed, 33 insertions(+), 13 deletions(-) > > This CPU patch did not get a Reviewed-by or Acked-by from me and was > still committed, even without indicating so here! Had you asked me, you > would've got one and my go-ahead, but what annoys me is that I learned > about you committing this through it breaking my qom-cpu-13 branch with > a conflict in target-i386/helper.c in later patch I had not yet > reviewed... :/ > > Please a) indicate you committed patches as an email reply to that > series and b) read the replies - me, Peter and Paolo were converging on > giving me the okay to take a subset of this series into qom-cpu, you
Sorry, I must have missed that part of the discussion. If the merge conflict was bad let me know and I'd be happy to help. Cheers, Edgar > neither asked nor did anyone propose committing them directly on the > mailing list. > > Thanks, > Andreas > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
