Merge branch 'master' into urcu/ht-shrink

diff --combined urcu-qsbr.c
index 6b6d3af6711ce44647ebd04dfc796c0495c988b7,a59a87a72df2178aa02f83d9a2a0b0d18e80a97c..553029578a210383df955fb384d6102ad807d51e
--- 1/urcu-qsbr.c
--- 2/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@@ -39,6 -39,7 +39,7 @@@
  #include "urcu/map/urcu-qsbr.h"
  #define BUILD_QSBR_LIB
  #include "urcu/static/urcu-qsbr.h"
+ #include "urcu-pointer.h"
  
  /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
  #undef _LGPL_SOURCE
@@@ -348,11 -349,7 +349,11 @@@ void rcu_unregister_thread(void
  
  void rcu_exit(void)
  {
 -      assert(cds_list_empty(&registry));
 +      /*
 +       * Assertion disabled because call_rcu threads are now rcu
 +       * readers, and left running at exit.
 +       * assert(cds_list_empty(&registry));
 +       */
  }
  
  #include "urcu-call-rcu-impl.h"