Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone
Signed-off-by:
J. R. Okajima <hooanon05g@gmail.com>
# Conflicts:
# Documentation/filesystems/aufs/design/01intro.txt
# Documentation/filesystems/aufs/design/02struct.txt
# Documentation/filesystems/aufs/design/03atomic_open.txt
# Documentation/filesystems/aufs/design/03lookup.txt
# Documentation/filesystems/aufs/design/04branch.txt
# Documentation/filesystems/aufs/design/05wbr_policy.txt
# Documentation/filesystems/aufs/design/06dirren.txt
# Documentation/filesystems/aufs/design/06fhsm.txt
# Documentation/filesystems/aufs/design/06mmap.txt
# Documentation/filesystems/aufs/design/06xattr.txt
# Documentation/filesystems/aufs/design/07export.txt
# Documentation/filesystems/aufs/design/08shwh.txt
# Documentation/filesystems/aufs/design/10dynop.txt
# fs/aufs/aufs.h
# fs/aufs/branch.c
# fs/aufs/branch.h
# fs/aufs/cpup.c
# fs/aufs/cpup.h
# fs/aufs/dbgaufs.c
# fs/aufs/dbgaufs.h
# fs/aufs/dcsub.c
# fs/aufs/dcsub.h
# fs/aufs/debug.c
# fs/aufs/debug.h
# fs/au...
Please register or sign in to comment