From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 16:52:05 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=47a469421d792dcb91a1e73319d26134241953d2;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'akpm' (patches from Andrew)

Merge second patchbomb from Andrew Morton:

 - most of the rest of MM

 - lots of misc things

 - procfs updates

 - printk feature work

 - updates to get_maintainer, MAINTAINERS, checkpatch

 - lib/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
  exit,stats: /* obey this comment */
  coredump: add __printf attribute to cn_*printf functions
  coredump: use from_kuid/kgid when formatting corename
  fs/reiserfs: remove unneeded cast
  NILFS2: support NFSv2 export
  fs/befs/btree.c: remove unneeded initializations
  fs/minix: remove unneeded cast
  init/do_mounts.c: add create_dev() failure log
  kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
  fs/efs: femove unneeded cast
  checkpatch: emit "NOTE: <types>" message only once after multiple files
  checkpatch: emit an error when there's a diff in a changelog
  checkpatch: validate MODULE_LICENSE content
  checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY
  checkpatch: suggest using eth_zero_addr() and eth_broadcast_addr()
  checkpatch: fix processing of MEMSET issues
  checkpatch: suggest using ether_addr_equal*()
  checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files
  checkpatch: remove local from codespell path
  checkpatch: add --showfile to allow input via pipe to show filenames
  ...
---

47a469421d792dcb91a1e73319d26134241953d2
diff --cc fs/ext4/super.c
index a7b4b6e10269,5f3c43a66937..5c787647afe2
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -3475,10 -3448,14 +3474,9 @@@ static int ext4_fill_super(struct super
  	if (sb->s_bdev->bd_part)
  		sbi->s_sectors_written_start =
  			part_stat_read(sb->s_bdev->bd_part, sectors[1]);
 -#ifdef CONFIG_EXT4_FS_ENCRYPTION
 -	/* Modes of operations for file and directory encryption. */
 -	sbi->s_file_encryption_mode = EXT4_ENCRYPTION_MODE_AES_256_XTS;
 -	sbi->s_dir_encryption_mode = EXT4_ENCRYPTION_MODE_INVALID;
 -#endif
  
  	/* Cleanup superblock name */
- 	for (cp = sb->s_id; (cp = strchr(cp, '/'));)
- 		*cp = '!';
+ 	strreplace(sb->s_id, '/', '!');
  
  	/* -EINVAL is default */
  	ret = -EINVAL;