From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBGsF-0008J6-35 for qemu-devel@nongnu.org; Fri, 10 Jun 2016 03:28:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBGs9-0003lZ-2t for qemu-devel@nongnu.org; Fri, 10 Jun 2016 03:28:57 -0400 Received: from [59.151.112.132] (port=29895 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBGs8-0003ip-FH for qemu-devel@nongnu.org; Fri, 10 Jun 2016 03:28:53 -0400 References: <1465200062-13824-1-git-send-email-caoj.fnst@cn.fujitsu.com> <878tye4am9.fsf@dusky.pond.sub.org> From: Cao jin Message-ID: <575A6D6F.9040606@cn.fujitsu.com> Date: Fri, 10 Jun 2016 15:34:07 +0800 MIME-Version: 1.0 In-Reply-To: <878tye4am9.fsf@dusky.pond.sub.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 00/15] Add param Error ** for msi_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Jason Wang , Marcel Apfelbaum , Alex Williamson , Hannes Reinecke , Dmitry Fleytman , Paolo Bonzini , John Snow , Gerd Hoffmann On 06/09/2016 11:58 PM, Markus Armbruster wrote: > I had only minor stylistic remarks this time. However, the series needs > a rebase already. If the conflict resolution is trivial, you may add my > Yes, it is trivial. just two file name changed in commit 605d52e62: -#include "vmxnet_tx_pkt.h" -#include "vmxnet_rx_pkt.h" +#include "net_tx_pkt.h" +#include "net_rx_pkt.h" But there is a new device "e1000e" added, so, there is additional part in patch 12, maybe you want to double check it. But I will add your R-b first:) Thanks very much! > Reviewed-by: Markus Armbruster > -- Yours Sincerely, Cao jin