On 06/25/2013 03:48 PM, Anthony Liguori wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > >> From: Michael S. Tsirkin <m...@redhat.com> >> >> The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b: >> >> target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000) > > Just as an aside, you should rebase and test before sending pull > requests. This conflicts with current tip. Normally, wouldn't be a > problem but FYI for the future. > > There's a trivial conflict with ppc-softmmu.mak that I can resolve but > also a conflict with Stefano's pull request that I cannot resolve > without rebasing :-/ So please rebase against latest tip and resubmit.
That, and there are review issues with 21/21 that should be resolved before it gets queued. https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04741.html -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
