Merge branch 'dev' into travisTest

diff --cc .travis.yml
index b7870b2d7d501e4963bb43f9b12f14c7abe4eb08,71b270196ec062b485b85ede70aec31af8f76c89..d41a6774de45e1276a33bc43ecbbaa66fe235b97
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -27,20 -20,23 +27,30 @@@ matrix
      - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-fuzztest'
      - env: Cmd='make clang38install && CC=clang-3.8 make clean tsan-test-zstream'
  
 -    - env: Cmd='make -C tests test-fuzzer-stackmode'
 -
 -    - env: Cmd='make valgrindinstall && make -C tests clean valgrindTest'
 -
      - env: Cmd='make arminstall && make armfuzz'
++<<<<<<< HEAD
 +    - env: Cmd='make arminstall && make aarch64fuzz'
++=======
+ 
+ # Following test is disabled, as there is a bug in Travis' ld
+ # preventing aarch64 compilation to complete.
+ # > collect2: error: ld terminated with signal 11 [Segmentation fault], core dumped
+ # to be re-enabled in a few commit, as it's possible that a random code change circumvent the ld bug
+ #    - env: Cmd='make arminstall && make aarch64fuzz'
+ 
++>>>>>>> dev
      - env: Cmd='make ppcinstall && make ppcfuzz'
      - env: Cmd='make ppcinstall && make ppc64fuzz'
 -    - env: Cmd='make -j uasanregressiontest && make clean && make -j msanregressiontest'
  
 -    - env: Cmd='make lz4install && make -C tests test-lz4 test-pool && make clean && bash tests/libzstd_partial_builds.sh'
 +    - env: Cmd='make -j uasanregressiontest
 +             && make clean && make -j msanregressiontest'
 +
 +    - env: Cmd='make valgrindinstall && make -C tests clean valgrindTest
 +             && make clean && make -C tests test-fuzzer-stackmode'
 +
 +    - env: Cmd='make lz4install && make -C tests test-lz4
 +             && make clean && make -C tests test-pool
 +             && make clean && bash tests/libzstd_partial_builds.sh'
  
      # tag-specific test
      - if: tag =~ ^v[0-9]\.[0-9]