Merge tag 'unicode-for-next-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel...

Pull unicode cleanup from Gabriel Krisman Bertazi:
 "A fix from Christoph Hellwig merging the CONFIG_UNICODE_UTF8_DATA into
  the previous CONFIG_UNICODE. It is -rc material since we don't want to
  expose the former symbol on 5.17.

  This has been living on linux-next for the past week"

* tag 'unicode-for-next-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode:
  unicode: clean up the Kconfig symbol confusion

diff --cc fs/Makefile
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/f2fs/f2fs.h
Simple merge

diff --cc fs/f2fs/recovery.c
Simple merge

diff --cc fs/f2fs/super.c
Simple merge

diff --cc fs/f2fs/sysfs.c
Simple merge

diff --cc include/linux/fs.h
Simple merge