Merge branch 'master' into urcu/rcuja-range

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --combined urcu/rculfhash.h
index 9c382120111c34d31d86fd80e9206d575626534a,afd0c3eafb34aff325843ea476b4714d90e86fe5..4c400ce81e5b534fcef71b6fec40142ac27ecea4
--- 1/urcu/rculfhash.h
--- 2/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@@ -177,7 -177,8 +177,8 @@@ struct cds_lfht *cds_lfht_new(unsigned 
   * Return 0 on success, negative error value on error.
   * Threads calling this API need to be registered RCU read-side threads.
   * cds_lfht_destroy should *not* be called from a RCU read-side critical
-  * section.
+  * section. It should *not* be called from a call_rcu thread context
+  * neither.
   */
  extern
  int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr);
@@@ -484,11 -485,6 +485,11 @@@ void cds_lfht_resize(struct cds_lfht *h
                        pos = caa_container_of(cds_lfht_iter_get_node(iter), \
                                        __typeof__(*(pos)), member))
  
 +/*
 + * cds_lfht_rcu_flavor: get RCU flavor argument from hash table creation.
 + */
 +const struct rcu_flavor_struct *cds_lfht_rcu_flavor(struct cds_lfht *ht);
 +
  #ifdef __cplusplus
  }
  #endif