Conflicts:
	.gitlab-ci.yml
	.gitmodules
	eos.spec.in
	fusex/CMakeLists.txt
	fusex/auth/ProcessInfo.cc
	fusex/auth/ShardedCache.hh
	fusex/cap/cap.cc
	fusex/data/cache.cc
	fusex/data/cache.hh
	fusex/data/data.hh
	fusex/data/dircleaner.hh
	fusex/data/diskcache.cc
	fusex/data/diskcache.hh
	fusex/data/journalcache.cc
	fusex/data/journalcache.hh
	fusex/data/memorycache.cc
	fusex/data/memorycache.hh
	fusex/kv/RedisKV.cc
	fusex/main.cc
	fusex/misc/ThreadPool.hh
	fusex/stat/Stat.cc
	fusex/stat/Stat.hh
	fusex/tests/CMakeLists.txt
	fusex/tests/IntervalTreeTest.cc
	fusex/tests/RBTreeTest.cc
	fusex/tests/TextRunner.cc
	fusex/tests/XrdClProxyTest.cc
	fusex/tests/journal-cache.cc
	mgm/FuseServer.hh