| Message ID | 1448541346-10851-1-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 32499ad278fe89fbb0c271d4462a986266270ad0 |
| Headers | show |
On 2015-11-26 15:35, Maxim Uvarov wrote: > Looks like merge conflict was not cleanly fixed moving > includes from Makefile.am to Makefile.inc. Adding > missed. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > --- > v2: - added missing std_clib.h (thanks Anders) > - patch prefix is API-NEXT > > platform/Makefile.inc | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > index e6984cc..0863c75 100644 > --- a/platform/Makefile.inc > +++ b/platform/Makefile.inc > @@ -32,22 +32,27 @@ odpapiinclude_HEADERS = \ > $(top_srcdir)/include/odp/api/debug.h \ > $(top_srcdir)/include/odp/api/errno.h \ > $(top_srcdir)/include/odp/api/event.h \ > + $(top_srcdir)/include/odp/api/hash.h \ > $(top_srcdir)/include/odp/api/hints.h \ > $(top_srcdir)/include/odp/api/init.h \ > $(top_srcdir)/include/odp/api/packet.h \ > $(top_srcdir)/include/odp/api/packet_flags.h \ > $(top_srcdir)/include/odp/api/packet_io.h \ > + $(top_srcdir)/include/odp/api/packet_io_stats.h \ > $(top_srcdir)/include/odp/api/pool.h \ > $(top_srcdir)/include/odp/api/queue.h \ > $(top_srcdir)/include/odp/api/random.h \ > $(top_srcdir)/include/odp/api/rwlock.h \ > + $(top_srcdir)/include/odp/api/rwlock_recursive.h \ > $(top_srcdir)/include/odp/api/schedule.h \ > $(top_srcdir)/include/odp/api/schedule_types.h \ > $(top_srcdir)/include/odp/api/shared_memory.h \ > $(top_srcdir)/include/odp/api/spinlock.h \ Nit: move this to the correct place alfabetic order... Reviewed-by: Anders Roxell <anders.roxell@linaro.org> Cheers, Anders > + $(top_srcdir)/include/odp/api/std_clib.h \ > $(top_srcdir)/include/odp/api/std_types.h \ > $(top_srcdir)/include/odp/api/sync.h \ > $(top_srcdir)/include/odp/api/system_info.h \ > + $(top_srcdir)/include/odp/api/spinlock_recursive.h \ > $(top_srcdir)/include/odp/api/thread.h \ > $(top_srcdir)/include/odp/api/thrmask.h \ > $(top_srcdir)/include/odp/api/ticketlock.h \ > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
Merged with reorder Thanks. On 11/26/2015 16:28, Anders Roxell wrote: > On 2015-11-26 15:35, Maxim Uvarov wrote: >> Looks like merge conflict was not cleanly fixed moving >> includes from Makefile.am to Makefile.inc. Adding >> missed. >> >> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> >> --- >> v2: - added missing std_clib.h (thanks Anders) >> - patch prefix is API-NEXT >> >> platform/Makefile.inc | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/platform/Makefile.inc b/platform/Makefile.inc >> index e6984cc..0863c75 100644 >> --- a/platform/Makefile.inc >> +++ b/platform/Makefile.inc >> @@ -32,22 +32,27 @@ odpapiinclude_HEADERS = \ >> $(top_srcdir)/include/odp/api/debug.h \ >> $(top_srcdir)/include/odp/api/errno.h \ >> $(top_srcdir)/include/odp/api/event.h \ >> + $(top_srcdir)/include/odp/api/hash.h \ >> $(top_srcdir)/include/odp/api/hints.h \ >> $(top_srcdir)/include/odp/api/init.h \ >> $(top_srcdir)/include/odp/api/packet.h \ >> $(top_srcdir)/include/odp/api/packet_flags.h \ >> $(top_srcdir)/include/odp/api/packet_io.h \ >> + $(top_srcdir)/include/odp/api/packet_io_stats.h \ >> $(top_srcdir)/include/odp/api/pool.h \ >> $(top_srcdir)/include/odp/api/queue.h \ >> $(top_srcdir)/include/odp/api/random.h \ >> $(top_srcdir)/include/odp/api/rwlock.h \ >> + $(top_srcdir)/include/odp/api/rwlock_recursive.h \ >> $(top_srcdir)/include/odp/api/schedule.h \ >> $(top_srcdir)/include/odp/api/schedule_types.h \ >> $(top_srcdir)/include/odp/api/shared_memory.h \ >> $(top_srcdir)/include/odp/api/spinlock.h \ > Nit: move this to the correct place alfabetic order... > > > Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > > Cheers, > Anders > >> + $(top_srcdir)/include/odp/api/std_clib.h \ >> $(top_srcdir)/include/odp/api/std_types.h \ >> $(top_srcdir)/include/odp/api/sync.h \ >> $(top_srcdir)/include/odp/api/system_info.h \ >> + $(top_srcdir)/include/odp/api/spinlock_recursive.h \ >> $(top_srcdir)/include/odp/api/thread.h \ >> $(top_srcdir)/include/odp/api/thrmask.h \ >> $(top_srcdir)/include/odp/api/ticketlock.h \ >> -- >> 1.9.1 >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/platform/Makefile.inc b/platform/Makefile.inc index e6984cc..0863c75 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -32,22 +32,27 @@ odpapiinclude_HEADERS = \ $(top_srcdir)/include/odp/api/debug.h \ $(top_srcdir)/include/odp/api/errno.h \ $(top_srcdir)/include/odp/api/event.h \ + $(top_srcdir)/include/odp/api/hash.h \ $(top_srcdir)/include/odp/api/hints.h \ $(top_srcdir)/include/odp/api/init.h \ $(top_srcdir)/include/odp/api/packet.h \ $(top_srcdir)/include/odp/api/packet_flags.h \ $(top_srcdir)/include/odp/api/packet_io.h \ + $(top_srcdir)/include/odp/api/packet_io_stats.h \ $(top_srcdir)/include/odp/api/pool.h \ $(top_srcdir)/include/odp/api/queue.h \ $(top_srcdir)/include/odp/api/random.h \ $(top_srcdir)/include/odp/api/rwlock.h \ + $(top_srcdir)/include/odp/api/rwlock_recursive.h \ $(top_srcdir)/include/odp/api/schedule.h \ $(top_srcdir)/include/odp/api/schedule_types.h \ $(top_srcdir)/include/odp/api/shared_memory.h \ $(top_srcdir)/include/odp/api/spinlock.h \ + $(top_srcdir)/include/odp/api/std_clib.h \ $(top_srcdir)/include/odp/api/std_types.h \ $(top_srcdir)/include/odp/api/sync.h \ $(top_srcdir)/include/odp/api/system_info.h \ + $(top_srcdir)/include/odp/api/spinlock_recursive.h \ $(top_srcdir)/include/odp/api/thread.h \ $(top_srcdir)/include/odp/api/thrmask.h \ $(top_srcdir)/include/odp/api/ticketlock.h \
Looks like merge conflict was not cleanly fixed moving includes from Makefile.am to Makefile.inc. Adding missed. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- v2: - added missing std_clib.h (thanks Anders) - patch prefix is API-NEXT platform/Makefile.inc | 5 +++++ 1 file changed, 5 insertions(+)