From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7NNO-0007hY-HT for qemu-devel@nongnu.org; Tue, 23 Jun 2015 08:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7NNL-0002Jw-8C for qemu-devel@nongnu.org; Tue, 23 Jun 2015 08:32:30 -0400 Received: from mail-vn0-f49.google.com ([209.85.216.49]:33749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7NNL-0002J9-2z for qemu-devel@nongnu.org; Tue, 23 Jun 2015 08:32:27 -0400 Received: by vnbf190 with SMTP id f190so1253146vnb.0 for ; Tue, 23 Jun 2015 05:32:26 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1434999889-849-1-git-send-email-armbru@redhat.com> References: <1434999889-849-1-git-send-email-armbru@redhat.com> From: Peter Maydell Date: Tue, 23 Jun 2015 13:32:06 +0100 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PULL 00/24] Monitor patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: QEMU Developers On 22 June 2015 at 20:04, Markus Armbruster wrote: > I'm afraid this pull is fairly prone to conflicts. Fingers crossed... > > The following changes since commit 0a3346f5dea0a679322df804e1e78d7c10d12a9f: > > Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2015-06-22 12:50:30 +0100) > > are available in the git repository at: > > > git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-06-22 > > for you to fetch changes up to a0b1a66ea39bca011108734147a72232a4d08c7a: > > Include monitor/monitor.h exactly where needed (2015-06-22 18:20:41 +0200) > > ---------------------------------------------------------------- > Monitor patches Applied, thanks. (no conflicts :)) -- PMM