Commit 47ae6e65 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone


Signed-off-by: default avatarJ. 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/aufs/dentry.c
#	fs/aufs/dentry.h
#	fs/aufs/dinfo.c
#	fs/aufs/dir.c
#	fs/aufs/dir.h
#	fs/aufs/dirren.c
#	fs/aufs/dirren.h
#	fs/aufs/dynop.c
#	fs/aufs/dynop.h
#	fs/aufs/export.c
#	fs/aufs/f_op.c
#	fs/aufs/fhsm.c
#	fs/aufs/file.c
#	fs/aufs/file.h
#	fs/aufs/finfo.c
#	fs/aufs/fstype.h
#	fs/aufs/hbl.h
#	fs/aufs/hfsnotify.c
#	fs/aufs/hfsplus.c
#	fs/aufs/hnotify.c
#	fs/aufs/i_op.c
#	fs/aufs/i_op_add.c
#	fs/aufs/i_op_del.c
#	fs/aufs/i_op_ren.c
#	fs/aufs/iinfo.c
#	fs/aufs/inode.c
#	fs/aufs/inode.h
#	fs/aufs/ioctl.c
#	fs/aufs/lcnt.h
#	fs/aufs/loop.c
#	fs/aufs/loop.h
#	fs/aufs/module.c
#	fs/aufs/module.h
#	fs/aufs/mvdown.c
#	fs/aufs/opts.c
#	fs/aufs/opts.h
#	fs/aufs/plink.c
#	fs/aufs/poll.c
#	fs/aufs/posix_acl.c
#	fs/aufs/procfs.c
#	fs/aufs/rdu.c
#	fs/aufs/rwsem.h
#	fs/aufs/sbinfo.c
#	fs/aufs/super.c
#	fs/aufs/super.h
#	fs/aufs/sysaufs.c
#	fs/aufs/sysaufs.h
#	fs/aufs/sysfs.c
#	fs/aufs/sysrq.c
#	fs/aufs/vdir.c
#	fs/aufs/vfsub.c
#	fs/aufs/vfsub.h
#	fs/aufs/wbr_policy.c
#	fs/aufs/whout.c
#	fs/aufs/whout.h
#	fs/aufs/wkq.c
#	fs/aufs/wkq.h
#	fs/aufs/xattr.c
#	fs/aufs/xino.c
#	include/uapi/linux/aufs_type.h
parents 58b60da0 e0e458ff
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2017-2019 Junjiro R. Okajima * Copyright (C) 2017-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2017-2019 Junjiro R. Okajima * Copyright (C) 2017-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2010-2019 Junjiro R. Okajima * Copyright (C) 2010-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2010-2019 Junjiro R. Okajima * Copyright (C) 2010-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2011-2019 Junjiro R. Okajima * Copyright (C) 2011-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Copyright (C) 2005-2019 Junjiro R. Okajima * Copyright (C) 2005-2020 Junjiro R. Okajima
* *
* This program, aufs is free software; you can redistribute it and/or modify * This program, aufs is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment