| Message ID | 1446116885-28746-1-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6d16b203444922e461bb6d8ae5e14a5e060f9b89 |
| Headers | show |
Reviewed-by: Balasubramanian Manoharan <bala.manoharan@linaro.org> On 29 October 2015 at 16:38, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > Looks like merge to api-next, cherry-pick from api-next > and merge master to api-next produced duplicate patch lines. > Found that with inspecting branches with 'git diff master api-next' > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > --- > example/classifier/odp_classifier.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c > index ae352b1..365c748 100644 > --- a/example/classifier/odp_classifier.c > +++ b/example/classifier/odp_classifier.c > @@ -365,11 +365,6 @@ static void configure_default_queue(odp_pktio_t pktio, appl_args_t *args) > exit(EXIT_FAILURE); > } > > - if (0 > odp_cos_queue_set(cos_default, queue_default)) { > - EXAMPLE_ERR("odp_cos_queue_set failed"); > - exit(EXIT_FAILURE); > - } > - > if (0 > odp_pktio_default_cos_set(pktio, cos_default)) { > EXAMPLE_ERR("odp_pktio_default_cos_set failed"); > exit(EXIT_FAILURE); > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index ae352b1..365c748 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -365,11 +365,6 @@ static void configure_default_queue(odp_pktio_t pktio, appl_args_t *args) exit(EXIT_FAILURE); } - if (0 > odp_cos_queue_set(cos_default, queue_default)) { - EXAMPLE_ERR("odp_cos_queue_set failed"); - exit(EXIT_FAILURE); - } - if (0 > odp_pktio_default_cos_set(pktio, cos_default)) { EXAMPLE_ERR("odp_pktio_default_cos_set failed"); exit(EXIT_FAILURE);
Looks like merge to api-next, cherry-pick from api-next and merge master to api-next produced duplicate patch lines. Found that with inspecting branches with 'git diff master api-next' Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- example/classifier/odp_classifier.c | 5 ----- 1 file changed, 5 deletions(-)