Merge e7675238 ("Merge tag 'ovl-update-6.13' of...
Merge e7675238 ("Merge tag 'ovl-update-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs" ) into android-mainline Steps on the way to 6.13-rc1 Resolves merge conflicts in: fs/fuse/passthrough.c kernel/cred.c Change-Id: Ib820011dd423ae79e29269a618e8ac6e6bc8b5bc Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Showing
- fs/backing-file.c 26 additions, 27 deletionsfs/backing-file.c
- fs/fuse/passthrough.c 21 additions, 16 deletionsfs/fuse/passthrough.c
- fs/overlayfs/copy_up.c 1 addition, 1 deletionfs/overlayfs/copy_up.c
- fs/overlayfs/dir.c 47 additions, 21 deletionsfs/overlayfs/dir.c
- fs/overlayfs/file.c 190 additions, 137 deletionsfs/overlayfs/file.c
- fs/overlayfs/inode.c 16 additions, 11 deletionsfs/overlayfs/inode.c
- fs/overlayfs/namei.c 5 additions, 5 deletionsfs/overlayfs/namei.c
- fs/overlayfs/overlayfs.h 4 additions, 0 deletionsfs/overlayfs/overlayfs.h
- fs/overlayfs/readdir.c 4 additions, 4 deletionsfs/overlayfs/readdir.c
- fs/overlayfs/util.c 11 additions, 3 deletionsfs/overlayfs/util.c
- fs/overlayfs/xattrs.c 4 additions, 5 deletionsfs/overlayfs/xattrs.c
- include/linux/backing-file.h 5 additions, 6 deletionsinclude/linux/backing-file.h
- include/linux/cred.h 18 additions, 0 deletionsinclude/linux/cred.h
- kernel/cred.c 3 additions, 3 deletionskernel/cred.c
Loading
Please register or sign in to comment