mbox series

[API-NEXT,00/15] Merge tag 'v1.13.0.0' into api-next

Message ID 20170127142921.29029-1-maxim.uvarov@linaro.org
Headers show
Series Merge tag 'v1.13.0.0' into api-next | expand

Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m. UTC 
Please review merge conflicts resolution for merge v1.13.0.0 into api-next branch.

Full merge is here:
https://github.com/muvarov/odp/commits/api-next

Conflicts can be found in approriate commit itself:
https://github.com/muvarov/odp/commit/ce824cbd747aa7d86200a4ddc1004f15d535932b

Git access is:
https://github.com/muvarov/odp.git
or
git@github.com:muvarov/odp.git

Travis CI passed for that tests:
https://travis-ci.org/muvarov/odp/builds/195867356

Idea is to squash all 'merge fix' commits into main merge commit before pushing
to official repo.

Thank you,
Maxim.

Maxim Uvarov (15):
  merge fix: platform/linux-generic/Makefile.am
  merge fix: doc/driver-api-guide/Doxyfile
  merge fix: _ishm
  merge fix: odp_config_internal.h
  merge fix: odp_schedule_if.h
  merge fix: odp_packet_internal.h
  merge fix: odp_init.c
  merge fix: odp_packet.c
  merge fix: odp_queue.c
  merge fix: ./platform/linux-generic/odp_schedule.c
  merge fix: odp_schedule_sp.c
  merge fix: odp_crypto_test_inp.c
  merge fix: test/common_plat/validation/api/packet/packet.h
  merge fix: test/common_plat/validation/api/packet/packet.c
  linux-gen: support older libconfig version

 doc/driver-api-guide/Doxyfile                      |  10 -
 platform/linux-generic/Makefile.am                 |  16 +-
 platform/linux-generic/_ishm.c                     |  21 -
 .../linux-generic/include/odp_config_internal.h    |  66 +--
 platform/linux-generic/include/odp_internal.h      |   6 -
 .../linux-generic/include/odp_packet_internal.h    |  25 -
 platform/linux-generic/include/odp_schedule_if.h   |   6 -
 platform/linux-generic/odp_init.c                  |  19 +-
 platform/linux-generic/odp_packet.c                | 513 ---------------------
 platform/linux-generic/odp_queue.c                 |   3 -
 platform/linux-generic/odp_schedule.c              | 119 -----
 platform/linux-generic/odp_schedule_sp.c           |  36 --
 .../validation/api/crypto/odp_crypto_test_inp.c    |  43 --
 test/common_plat/validation/api/packet/packet.c    | 483 -------------------
 test/common_plat/validation/api/packet/packet.h    |   3 -
 15 files changed, 23 insertions(+), 1346 deletions(-)

-- 
2.11.0.295.gd7dffce