Merge branch 'master' into 2018-05-11-fork-libdm

diff --cc daemons/clvmd/lvm-functions.c
Simple merge

diff --cc daemons/lvmlockd/lvmlockd-core.c
Simple merge

diff --cc lib/cache/lvmcache.c
Simple merge

diff --cc lib/cache/lvmcache.h
Simple merge

diff --cc lib/cache/lvmetad.c
Simple merge

diff --cc lib/device/bcache.c
index d224436d24069e65c18a1c4db1bce47d9712576f,d9bacf8bb4562a2367961c01ad59d21413d3d15c..8fda0bdfdb4034e295d9432f4179a1c47e57e8f0
--- 1/lib/device/bcache.c
--- 2/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@@ -14,9 -14,11 +14,11 @@@
  
  #define _GNU_SOURCE
  
 -#include "bcache.h"
 +#include "lib/device/bcache.h"
+ 
+ #include "base/data-struct/radix-tree.h"
 -#include "lvm-logging.h"
 -#include "log.h"
 +#include "lib/log/lvm-logging.h"
 +#include "lib/log/log.h"
  
  #include <errno.h>
  #include <fcntl.h>

diff --cc lib/device/dev-cache.c
Simple merge

diff --cc lib/device/dev-cache.h
Simple merge

diff --cc lib/device/device.h
Simple merge

diff --cc lib/filters/filter-md.c
Simple merge

diff --cc lib/filters/filter-persistent.c
Simple merge

diff --cc lib/format_text/archive.c
Simple merge

diff --cc lib/label/label.c
Simple merge

diff --cc lib/label/label.h
Simple merge

diff --cc lib/locking/locking.c
Simple merge

diff --cc lib/locking/lvmlockd.c
Simple merge

diff --cc lib/metadata/cache_manip.c
Simple merge

diff --cc lib/metadata/lv_manip.c
Simple merge

diff --cc lib/metadata/metadata-exported.h
Simple merge

diff --cc lib/metadata/metadata-liblvm.c
Simple merge

diff --cc lib/metadata/metadata.c
Simple merge

diff --cc lib/metadata/mirror.c
Simple merge

diff --cc lib/metadata/raid_manip.c
index cef0427b9e841a069bc5ca1f557a9ed2377316ed,0c631b481efc910381fc6a962fe3e63b0a21e543..f53915b365c37ca7260515f8c51ec3054304b6d5
--- 1/lib/metadata/raid_manip.c
--- 2/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@@ -12,15 -12,16 +12,16 @@@
   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 -#include "lib.h"
 -#include "archiver.h"
 -#include "metadata.h"
 -#include "toolcontext.h"
 -#include "segtype.h"
 -#include "display.h"
 -#include "activate.h"
 -#include "lv_alloc.h"
 -#include "lvm-string.h"
 -#include "lvmlockd.h"
 +#include "lib/misc/lib.h"
 +#include "lib/format_text/archiver.h"
 +#include "lib/metadata/metadata.h"
 +#include "lib/commands/toolcontext.h"
 +#include "lib/metadata/segtype.h"
 +#include "lib/display/display.h"
 +#include "lib/activate/activate.h"
 +#include "lib/metadata/lv_alloc.h"
 +#include "lib/misc/lvm-string.h"
++#include "lib/locking/lvmlockd.h"
  
  typedef int (*fn_on_lv_t)(struct logical_volume *lv, void *data);
  static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg,

diff --cc lib/metadata/thin_manip.c
Simple merge

diff --cc lib/report/properties.c
Simple merge

diff --cc lib/report/report.c
Simple merge

diff --cc make.tmpl.in
index c4d9d583ff575ada1f4843ad97b4f5bb14da8859,1f999ec69a1d9a749ebcb08ecc54488c987c7f67..10075d4a1624b522d0811e7cd7728c5e1ec6dae6
--- 1/make.tmpl.in
--- 2/make.tmpl.in
+++ b/make.tmpl.in
@@@ -310,8 -308,10 +310,9 @@@ LIB_VERSION_APP := $(shell $(AWK) -F '[
  
  INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include
  
 -INC_LNS = $(top_builddir)/include/.symlinks_created
+ 
  DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
 -       $(top_builddir)/Makefile $(INC_LNS)
 +       $(top_builddir)/Makefile
  
  OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
  POTFILES = $(SOURCES:%.c=%.pot)

diff --cc test/api/Makefile.in
Simple merge

diff --cc test/api/vgtest.c
Simple merge

diff --cc tools/lvchange.c
Simple merge

diff --cc tools/lvconvert.c
Simple merge

diff --cc tools/reporter.c
Simple merge

diff --cc tools/toollib.c
Simple merge

diff --cc tools/vgimportclone.c
Simple merge