Merge fb527fc1 ("Merge tag 'fuse-update-6.13' of...
Merge fb527fc1 ("Merge tag 'fuse-update-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse" ) into android-mainline Steps on the way to 6.13-rc1 Resolves merge conflicts in: fs/fuse/fuse_i.h Change-Id: I7e1f680e57d4f3de66c952c0e5f877f1992598e2 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
No related branches found
No related tags found
Showing
- Documentation/admin-guide/sysctl/fs.rst 10 additions, 0 deletionsDocumentation/admin-guide/sysctl/fs.rst
- fs/fuse/Makefile 1 addition, 0 deletionsfs/fuse/Makefile
- fs/fuse/cuse.c 15 additions, 14 deletionsfs/fuse/cuse.c
- fs/fuse/dax.c 0 additions, 11 deletionsfs/fuse/dax.c
- fs/fuse/dev.c 39 additions, 27 deletionsfs/fuse/dev.c
- fs/fuse/dir.c 19 additions, 18 deletionsfs/fuse/dir.c
- fs/fuse/file.c 258 additions, 191 deletionsfs/fuse/file.c
- fs/fuse/fuse_i.h 47 additions, 22 deletionsfs/fuse/fuse_i.h
- fs/fuse/inode.c 54 additions, 13 deletionsfs/fuse/inode.c
- fs/fuse/ioctl.c 18 additions, 17 deletionsfs/fuse/ioctl.c
- fs/fuse/readdir.c 18 additions, 15 deletionsfs/fuse/readdir.c
- fs/fuse/sysctl.c 40 additions, 0 deletionsfs/fuse/sysctl.c
- fs/fuse/virtio_fs.c 42 additions, 35 deletionsfs/fuse/virtio_fs.c
- include/linux/mm.h 1 addition, 0 deletionsinclude/linux/mm.h
- mm/folio-compat.c 6 additions, 0 deletionsmm/folio-compat.c
- mm/page-writeback.c 11 additions, 11 deletionsmm/page-writeback.c
Loading
Please register or sign in to comment