Merge remote-tracking branch 'userns/for-next'
Conflicts: drivers/firmware/efi/efi.c fs/libfs.c
Showing
- arch/s390/hypfs/inode.c 4 additions, 8 deletionsarch/s390/hypfs/inode.c
- drivers/firmware/efi/efi.c 2 additions, 4 deletionsdrivers/firmware/efi/efi.c
- fs/configfs/mount.c 4 additions, 6 deletionsfs/configfs/mount.c
- fs/dcache.c 0 additions, 11 deletionsfs/dcache.c
- fs/debugfs/inode.c 4 additions, 7 deletionsfs/debugfs/inode.c
- fs/fuse/inode.c 3 additions, 6 deletionsfs/fuse/inode.c
- fs/kernfs/dir.c 37 additions, 1 deletionfs/kernfs/dir.c
- fs/kernfs/inode.c 2 additions, 0 deletionsfs/kernfs/inode.c
- fs/libfs.c 95 additions, 0 deletionsfs/libfs.c
- fs/namespace.c 33 additions, 6 deletionsfs/namespace.c
- fs/proc/generic.c 23 additions, 0 deletionsfs/proc/generic.c
- fs/proc/inode.c 4 additions, 0 deletionsfs/proc/inode.c
- fs/proc/internal.h 6 additions, 0 deletionsfs/proc/internal.h
- fs/proc/proc_sysctl.c 37 additions, 0 deletionsfs/proc/proc_sysctl.c
- fs/proc/root.c 3 additions, 6 deletionsfs/proc/root.c
- fs/pstore/inode.c 4 additions, 8 deletionsfs/pstore/inode.c
- fs/sysfs/dir.c 34 additions, 0 deletionsfs/sysfs/dir.c
- fs/sysfs/mount.c 1 addition, 4 deletionsfs/sysfs/mount.c
- fs/tracefs/inode.c 2 additions, 4 deletionsfs/tracefs/inode.c
- include/linux/fs.h 3 additions, 1 deletioninclude/linux/fs.h
Loading
Please register or sign in to comment