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/au...
parents 58b60da0 e0e458ff
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2015-2019 Junjiro R. Okajima
# Copyright (C) 2015-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2017-2019 Junjiro R. Okajima
# Copyright (C) 2017-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2011-2019 Junjiro R. Okajima
# Copyright (C) 2011-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2014-2019 Junjiro R. Okajima
# Copyright (C) 2014-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2005-2019 Junjiro R. Okajima
# Copyright (C) 2005-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Copyright (C) 2010-2019 Junjiro R. Okajima
# Copyright (C) 2010-2020 Junjiro R. Okajima
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
/* 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
* it under the terms of the GNU General Public License as published by
......
// 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
* it under the terms of the GNU General Public License as published by
......
/* 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
* it under the terms of the GNU General Public License as published by
......
// 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
* it under the terms of the GNU General Public License as published by
......
/* 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
* it under the terms of the GNU General Public License as published by
......
// 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
* it under the terms of the GNU General Public License as published by
......
/* 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
* 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