Merge branch 'aufs3.5/11proc_map' into aufs3.6/11proc_map
Merge branch 'aufs3.6/10static' into aufs3.6/11proc_map
Merge branch 'aufs3.6/10static' into aufs3.7/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.7/00base' into aufs3.7/10static
Merge branch 'aufs3.6/11proc_map' into aufs3.7/11proc_map
Merge branch 'aufs3.7/10static' into aufs3.7/11proc_map
Merge branch 'aufs3.7/10static' into aufs3.8/10static

Conflicts:
	fs/aufs/branch.h

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge remote-tracking branch 'aufs3-standalone/aufs3.8/00base' into aufs3.8/10static
Merge branch 'aufs3.7/11proc_map' into aufs3.8/11proc_map

Conflicts:
	fs/aufs/branch.h

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge branch 'aufs3.8/00base' into aufs3.9/00base
Merge branch 'aufs3.8/10static' into aufs3.8/11proc_map
aufs: bugfix, support an error in copy-up

By implementing a new feature "move-down", an error which have never
happened can rise in copy-up (actually copy-down).
So add an error-handling code.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
aufs: for mvdown, copy-up breaks "=ro"

In order to force move-down/copy-down, the copy-up operation writes to
the RO branch (breaks "=ro"). Of course, if the branch fs is natively
readonly, aufs cannot write.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
aufs: mvdown, an option to force writing RO lower branch

A new flag AUFS_MVDOWN_ROLOWER specifies breaking the branch attribute.
When this flag is set, aufs moves-down the file even if the branch is RO.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
aufs: mvdown, an option to force removing RO upper branch

A new flag AUFS_MVDOWN_ROUPPER specifies breaking the branch attribute.
When this flag is set, aufs moves-down the file even if the branch is RO.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
aufs: mvdown, options for branch id

Now aumvdown(8) can specify src/dst branches by their branch ids.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge branch 'aufs3.2/00base' into aufs3.3/00base
Merge branch 'aufs3.3/00base' into aufs3.4/00base
Merge branch 'aufs3.4/00base' into aufs3.5/00base
Merge branch 'aufs3.5/00base' into aufs3.6/00base