]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:22:24 +0000 (11:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:22:24 +0000 (11:22 +1000)
commitee1d7478b71d12d887db9eddceab5435e7d3f8fa
tree3bba7990d5e8fd4d176e58939244609978b712c1
parentcda9f7a170ee87476f1e45b07751ef2eb94959af
parent6fa1bf18db71849d21b2fb7e84b860c9fbef9e48
Merge remote-tracking branch 'vfs/for-next'

# Conflicts:
# fs/btrfs/ioctl.c
# fs/overlayfs/file.c
# fs/xfs/xfs_ioctl.c
34 files changed:
fs/afs/inode.c
fs/btrfs/ctree.h
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/cifs/cifsproto.h
fs/cifs/dir.c
fs/cifs/file.c
fs/cifs/inode.c
fs/cifs/readdir.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ext2/ext2.h
fs/ext2/namei.c
fs/ext4/ext4.h
fs/ext4/ioctl.c
fs/ext4/namei.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/namei.c
fs/fuse/file.c
fs/fuse/fuse_i.h
fs/fuse/inode.c
fs/hostfs/hostfs_kern.c
fs/inode.c
fs/nfsd/nfsproc.c
fs/ocfs2/file.c
fs/overlayfs/file.c
fs/overlayfs/inode.c
fs/overlayfs/namei.c
fs/overlayfs/overlayfs.h
fs/overlayfs/readdir.c
fs/xfs/libxfs/xfs_fs.h
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iops.c
include/linux/fs.h