[kernel] r21783 - in dists/trunk/linux/debian: . patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Sep  8 02:16:51 2014
New Revision: 21783

Log:
MAINTAINERS: Change aufs entry to say it's not upstream

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/debian/aufs3-mark-as-staging.patch

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Sep  8 01:24:43 2014	(r21782)
+++ dists/trunk/linux/debian/changelog	Mon Sep  8 02:16:51 2014	(r21783)
@@ -64,6 +64,7 @@
     - 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).

Modified: dists/trunk/linux/debian/patches/debian/aufs3-mark-as-staging.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/aufs3-mark-as-staging.patch	Mon Sep  8 01:24:43 2014	(r21782)
+++ dists/trunk/linux/debian/patches/debian/aufs3-mark-as-staging.patch	Mon Sep  8 02:16:51 2014	(r21783)
@@ -5,9 +5,11 @@
 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 @@
  
  /* 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 at 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