Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.11

diff --cc lib/Makefile
index 6f44b008ac232bddf24e1b2b3007f82c692a2202,d884ffb059ad55107f4ee98013f704243c0f9e71..52751e11e95035c8e88d4631824df3b12f09e7c7
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -59,8 -55,7 +59,8 @@@ LIBUCW_INCLUDES= 
        md5.h \
        base64.h base224.h \
        qache.h \
-       kmp.h kmp-search.h \
 -      kmp.h kmp-search.h binsearch.h
++      kmp.h kmp-search.h binsearch.h \
 +      partmap.h
  
  ifdef CONFIG_UCW_THREADS
  # Some modules require threading