[kernel] r22150 - in dists/trunk/linux/debian: . config patches patches/debian patches/features/all/aufs3

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 03:09:37 2014
New Revision: 22150

Log:
Replace aufs with overlayfs

Deleted:
   dists/trunk/linux/debian/patches/debian/aufs3-mark-as-staging.patch
   dists/trunk/linux/debian/patches/features/all/aufs3/
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  9 03:06:08 2014	(r22149)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 03:09:37 2014	(r22150)
@@ -2,6 +2,10 @@
 
   * New upstream release: http://kernelnewbies.org/Linux_3.18
 
+  [ Ben Hutchings ]
+  * Remove aufs
+  * vfs: Enable OVERLAY_FS as module
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
 linux (3.17.4-1~exp1) experimental; urgency=medium

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Dec  9 03:06:08 2014	(r22149)
+++ dists/trunk/linux/debian/config/config	Tue Dec  9 03:09:37 2014	(r22150)
@@ -4436,26 +4436,6 @@
 CONFIG_AFS_FSCACHE=y
 
 ##
-## file: fs/aufs/Kconfig
-##
-CONFIG_AUFS_FS=m
-## choice: Maximum number of branches
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-## end choice
-# CONFIG_AUFS_HNOTIFY is not set
-CONFIG_AUFS_EXPORT=y
-# CONFIG_AUFS_FHSM is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-# CONFIG_AUFS_DEBUG is not set
-
-##
 ## file: fs/autofs4/Kconfig
 ##
 CONFIG_AUTOFS4_FS=m
@@ -4839,6 +4819,11 @@
 CONFIG_OMFS_FS=m
 
 ##
+## file: fs/overlayfs/Kconfig
+##
+CONFIG_OVERLAY_FS=m
+
+##
 ## file: fs/proc/Kconfig
 ##
 CONFIG_PROC_FS=y

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Tue Dec  9 03:06:08 2014	(r22149)
+++ dists/trunk/linux/debian/patches/series	Tue Dec  9 03:09:37 2014	(r22150)
@@ -16,16 +16,6 @@
 bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
 bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
 
-# Patches and source files from aufs3 repository, imported with
-# debian/patches/features/all/aufs3/gen-patch.
-#features/all/aufs3/aufs3-kbuild.patch
-#features/all/aufs3/aufs3-base.patch
-#features/all/aufs3/aufs3-mmap.patch
-#features/all/aufs3/aufs3-standalone.patch
-#features/all/aufs3/aufs3-add.patch
-# Debian-specific changes
-#debian/aufs3-mark-as-staging.patch
-
 # Change some defaults for security reasons
 debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
 debian/rds-Disable-auto-loading-as-mitigation-against-local.patch