diff options
| author | Ben Hutchings <benh@debian.org> | 2014-09-08 02:16:51 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-09-08 02:16:51 +0000 |
| commit | 5187f832792f376a3c2463345849232ae90e0a8f (patch) | |
| tree | 9e4fcbc09aa933bbcb9e226af416c354deba640f | |
| parent | 7f39df641306757b3deaf42ea196378c28dc98a0 (diff) | |
| download | kernel_replicant_linux-5187f832792f376a3c2463345849232ae90e0a8f.tar.gz kernel_replicant_linux-5187f832792f376a3c2463345849232ae90e0a8f.tar.bz2 kernel_replicant_linux-5187f832792f376a3c2463345849232ae90e0a8f.zip | |
MAINTAINERS: Change aufs entry to say it's not upstream
svn path=/dists/trunk/linux/; revision=21783
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/debian/aufs3-mark-as-staging.patch | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index da7e9a38def7..08bca3a5a592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,7 @@ linux (3.16.2-1) UNRELEASED; urgency=medium - possible bugfix, temporary d_inode - fhsm and br_del, allow the root dir only - bugfix, get a removed dentry from an inode + * MAINTAINERS: Change aufs entry to say it's not upstream [ Vagrant Cascadian ] * [armmp] Enable IMX_IPUV3_CORE (closes: #756810). diff --git a/debian/patches/debian/aufs3-mark-as-staging.patch b/debian/patches/debian/aufs3-mark-as-staging.patch index c13fc5fff646..9f26978e1746 100644 --- a/debian/patches/debian/aufs3-mark-as-staging.patch +++ b/debian/patches/debian/aufs3-mark-as-staging.patch @@ -5,9 +5,11 @@ Forwarded: not-needed This hasn't been reviewed upstream, so should have the same status as code in drivers/staging. +Also note in the MAINTAINERS file that it's not upstream. + --- a/fs/aufs/module.c +++ b/fs/aufs/module.c -@@ -104,6 +104,7 @@ MODULE_DESCRIPTION(AUFS_NAME +@@ -103,6 +103,7 @@ MODULE_DESCRIPTION(AUFS_NAME " -- Advanced multi layered unification filesystem"); MODULE_VERSION(AUFS_VERSION); MODULE_ALIAS_FS(AUFS_NAME); @@ -15,3 +17,14 @@ as code in drivers/staging. /* this module parameter has no meaning when SYSFS is disabled */ int sysaufs_brs = 1; +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -1705,7 +1705,7 @@ L: aufs-users@lists.sourceforge.net (mem + W: http://aufs.sourceforge.net + T: git://git.code.sf.net/p/aufs/aufs3-linux + T: git://github.com/sfjro/aufs3-linux.git +-S: Supported ++S: Supported, not upstream + F: Documentation/filesystems/aufs/ + F: Documentation/ABI/testing/debugfs-aufs + F: Documentation/ABI/testing/sysfs-aufs |