linux-next: manual merge of the akpm-current tree with the ext4 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/ext4/file.c between commit: 545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA") from the ext4 tree and commit: f7d4010a3383 ("mm, pagevec: remove cold parameter for pagevecs") from the akpm-

linux-next: manual merge of the akpm-current tree with the ext4 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/ext4/fsync.c between commit: 78d962510796 ("ext4: respect the nobarrier mount option in nojournal mode") from the ext4 tree and commit: 045d9e206ac0 ("fs/ext4/fsync.c: generic_file_fsync call based on bar

linux-next: manual merge of the akpm-current tree with the ext4 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/ext4/page-io.c between commit a3f79014dc44 ("ext4: fix zeroing of page during writeback") from the ext4 tree and commit 97527831700a ("fs/buffer.c: remove block_write_full_page_endio()") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with the ext4 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/ext4/inode.c between commit 4958dee0e70f ("ext4: simplify truncation code in ext4_setattr()") from the ext4 tree and commit fb6854ec9753 ("truncate: drop 'oldsize' truncate_pagecache() parameter") from the akpm-curre