linux-next: manual merge of the unicode tree with the f2fs tree

linux-next: manual merge of the unicode tree with the f2fs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

Hi all,

Today's linux-next merge of the unicode tree got a conflict in:

  fs/f2fs/sysfs.c

between commit:

  84eab2a899f2 ("f2fs: replace snprintf in show functions with sysfs_emit")

from the f2fs tree and commit:

  a440943e68cd ("unicode: remove the charset field from struct unicode_map")

from the unicode tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/sysfs.c
index 7d289249cd7e,650e84398f74..000000000000
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@@ -196,8 -196,7 +196,7 @@@ static ssize_t encoding_show(struct f2f
  	struct super_block *sb = sbi->sb;
  
  	if (f2fs_sb_has_casefold(sbi))
- 		return sysfs_emit(buf, "%s (%d.%d.%d)\n",
- 			sb->s_encoding->charset,
 -		return snprintf(buf, PAGE_SIZE, "UTF-8 (%d.%d.%d)\n",
++		return sysfs_emit(buf, "UTF-8 (%d.%d.%d)\n",
  			(sb->s_encoding->version >> 16) & 0xff,
  			(sb->s_encoding->version >> 8) & 0xff,
  			sb->s_encoding->version & 0xff);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]