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 <[email protected]> > Signed-off-by: Jasvinder Singh <[email protected]> > > Acked-by: Cristian Dumitrescu <[email protected]> > Acked-by: Thomas Monjalon <[email protected]>
<...> > --- 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 <Member_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?
