Conflicts: fs/nfs/inode.c fs/super.c Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount' |
||
|---|---|---|
| .. | ||
| file.c | ||
| inode.c | ||
| Makefile | ||
Conflicts: fs/nfs/inode.c fs/super.c Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount' |
||
|---|---|---|
| .. | ||
| file.c | ||
| inode.c | ||
| Makefile | ||