Hi Thomas Ok, I will resolve the conflict and send the v2 patch. Thanks and regards, Changchun
-----Original Message----- From: Thomas Monjalon [mailto:thomas.monja...@6wind.com] Sent: Tuesday, July 22, 2014 9:29 PM To: Ouyang, Changchun Cc: dev at dpdk.org Subject: Re: [dpdk-dev] [PATCH] virtio: Support mergeable buffer in virtio PMD. Hi, 2014-07-12 10:24, Ouyang Changchun: > This patch supports mergeable buffer feature in DPDK based virtio PMD, > which can receive jumbo frame with larger size, like 3K, 4K or even 9K. > > Signed-off-by: Ouyang Changchun <changchun.ouyang at intel.com> Could you please rebase your patch on current master branch? There is a conflict about statistics and I'd prefer you manage it by yourself. The conflicting commit is "virtio: maintain stats per queue": http://dpdk.org/browse/dpdk/commit/?id=9658d17da27bdaa By the way, it would be really helpful if someone would like to carefully review this patch. Thanks -- Thomas