Text conflict in mysql-test/r/func_time.result
  Text conflict in mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
  Text conflict in mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
  Text conflict in mysql-test/t/func_time.test
  Text conflict in scripts/CMakeLists.txt
  Text conflict in sql/sql_connect.cc
  Text conflict in storage/innobase/handler/i_s.cc
  Text conflict in storage/innobase/row/row0sel.c
  
  Manual fixes:
  call PSI_server->set_thread_user_host() in acl_authenticate() in sql_acl.cc