From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 7311C1B1FF for ; Mon, 9 Oct 2017 22:18:58 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2017 13:18:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,501,1500966000"; d="scan'208";a="908286386" Received: from unknown (HELO [10.241.225.162]) ([10.241.225.162]) by FMSMGA003.fm.intel.com with ESMTP; 09 Oct 2017 13:18:56 -0700 To: Jasvinder Singh , dev@dpdk.org Cc: cristian.dumitrescu@intel.com, thomas@monjalon.net, wenzhuo.lu@intel.com References: <20171006170003.77311-2-jasvinder.singh@intel.com> <20171009125846.106218-1-jasvinder.singh@intel.com> <20171009125846.106218-2-jasvinder.singh@intel.com> From: Ferruh Yigit Message-ID: <25393bd9-ccaa-56ca-c812-f8928b18e7b4@intel.com> Date: Mon, 9 Oct 2017 21:18:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20171009125846.106218-2-jasvinder.singh@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v7 1/5] net/softnic: add softnic PMD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Oct 2017 20:18:58 -0000 On 10/9/2017 1:58 PM, Jasvinder Singh wrote: > Add SoftNIC PMD to provide SW fall-back for ethdev APIs. > > Signed-off-by: Cristian Dumitrescu > Signed-off-by: Jasvinder Singh > > Acked-by: Cristian Dumitrescu > Acked-by: Thomas Monjalon <...> > --- a/doc/guides/rel_notes/release_17_11.rst > +++ b/doc/guides/rel_notes/release_17_11.rst > @@ -81,6 +81,7 @@ New Features > See the :ref:`Membership Library ` documentation in > the Programmers Guide document, for more information. > > +<<<<<<< a3dabd30369bd73017fa367725fb1b455074a2ca > * **Added the Generic Segmentation Offload Library.** > > Added the Generic Segmentation Offload (GSO) library to enable > @@ -96,6 +97,12 @@ New Features > The GSO library doesn't check if the input packets have correct > checksums, and doesn't update checksums for output packets. > Additionally, the GSO library doesn't process IP fragmented packets. > +======= > +* **Added SoftNIC PMD.** > + > + Added new SoftNIC PMD. This virtual device offers applications a software > + fallback support for traffic management. > +>>>>>>> net/softnic: add softnic PMD This looks like merge artifact, can you please fix this?