From dd10090e07af91ea2f9320e0b3b82a9dcee37add Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 11 Sep 2013 19:46:34 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/config   - Set
 EXT4_USE_FOR_EXT23.   - Unset EXT2_FS, EXT3_FS. *
 debian/config/kernelarch-mips/config, debian/config/m68k/config:   Remove
 overrides.

svn path=/dists/trunk/linux/; revision=20606
---
 debian/changelog                     |  1 +
 debian/config/config                 | 13 +++----------
 debian/config/kernelarch-mips/config | 11 -----------
 debian/config/m68k/config            | 15 ---------------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37bda3fb1..75ebaaf15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ linux (3.11-1~exp1) UNRELEASED; urgency=low
   * Make gcc-4.8 the default compiler.
   * Use default font selection.
   * Enable NFS 4.2 client support.
+  * Use ext4 for all ext-variants.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 01 Sep 2013 18:45:47 +0100
 
diff --git a/debian/config/config b/debian/config/config
index c311eefad..40fa7031e 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3972,25 +3972,18 @@ CONFIG_EXOFS_FS=m
 ##
 ## file: fs/ext2/Kconfig
 ##
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT2_FS is not set
 
 ##
 ## file: fs/ext3/Kconfig
 ##
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT3_FS is not set
 
 ##
 ## file: fs/ext4/Kconfig
 ##
 CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index a85a33649..d2bc59614 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -19,19 +19,8 @@ CONFIG_BLK_DEV_SD=y
 ##
 # CONFIG_VGA_CONSOLE is not set
 
-##
-## file: fs/ext2/Kconfig
-##
-# CONFIG_EXT2_FS is not set
-
-##
-## file: fs/ext3/Kconfig
-##
-# CONFIG_EXT3_FS is not set
-
 ##
 ## file: fs/ext4/Kconfig
 ##
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
 
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 786880af8..088dca7e6 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -666,21 +666,6 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_EXOFS_FS is not set
 
-##
-## file: fs/ext2/Kconfig
-##
-# CONFIG_EXT2_FS_SECURITY is not set
-
-##
-## file: fs/ext3/Kconfig
-##
-# CONFIG_EXT3_FS_SECURITY is not set
-
-##
-## file: fs/ext4/Kconfig
-##
-# CONFIG_EXT4_FS_SECURITY is not set
-
 ##
 ## file: fs/f2fs/Kconfig
 ##