Hi Linus, We've had some trouble recently with page_offset() being confusingly named. To minimise conflicts, I automatically generated these two rename patches just now so you can merge it right before -rc1. I included the coccinelle scripts in the commit messages so you can generate the patches yourself if you'd rather do that. The following changes since commit b032227c62939b5481bcd45442b36dfa263f4a7c: Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 (2020-04-11 11:38:44 -0700) are available in the Git repository at: git://git.infradead.org/users/willy/linux-dax.git tags/page_pos for you to fetch changes up to d80f6dd912904b261010b14928b8ba89d8dd88bd: fs: Rename page_file_offset() to page_file_pos() (2020-04-11 16:17:34 -0400) ---------------------------------------------------------------- Rename page_offset to page_pos ---------------------------------------------------------------- Matthew Wilcox (Oracle) (2): fs: Rename page_offset() to page_pos() fs: Rename page_file_offset() to page_file_pos() fs/9p/vfs_addr.c | 4 ++-- fs/afs/dir.c | 2 +- fs/btrfs/compression.c | 8 ++++---- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent_io.c | 28 ++++++++++++++-------------- fs/btrfs/file-item.c | 4 ++-- fs/btrfs/inode.c | 22 +++++++++++----------- fs/btrfs/ioctl.c | 6 +++--- fs/btrfs/relocation.c | 2 +- fs/buffer.c | 2 +- fs/ceph/addr.c | 26 +++++++++++++------------- fs/cifs/cifssmb.c | 2 +- fs/cifs/file.c | 8 ++++---- fs/erofs/zdata.c | 2 +- fs/ext2/dir.c | 6 +++--- fs/ext4/inode.c | 2 +- fs/f2fs/file.c | 2 +- fs/fuse/file.c | 10 +++++----- fs/gfs2/file.c | 4 ++-- fs/hostfs/hostfs_kern.c | 4 ++-- fs/iomap/buffered-io.c | 22 +++++++++++----------- fs/iomap/seek.c | 4 ++-- fs/isofs/compress.c | 2 +- fs/minix/dir.c | 6 +++--- fs/nfs/file.c | 4 ++-- fs/nfs/write.c | 6 +++--- fs/nilfs2/dir.c | 4 ++-- fs/nilfs2/file.c | 2 +- fs/nilfs2/page.c | 2 +- fs/ocfs2/aops.c | 6 +++--- fs/ocfs2/mmap.c | 4 ++-- fs/orangefs/inode.c | 48 ++++++++++++++++++++++++------------------------ fs/romfs/super.c | 2 +- fs/sysv/dir.c | 6 +++--- fs/ubifs/file.c | 2 +- fs/ufs/dir.c | 6 +++--- fs/vboxsf/file.c | 4 ++-- fs/xfs/xfs_aops.c | 2 +- include/linux/pagemap.h | 4 ++-- mm/page_io.c | 4 ++-- 40 files changed, 144 insertions(+), 144 deletions(-)