bump version to 2.6.32-102

[pve-kernel-2.6.32.git] / config-2.6.32.diff

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index 7bb3507741b08b00c5f9c5d461f39e7e0718a213..b39650877db2d762ac57cf6a5c18afe86434e86e 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,15 +1,6 @@
---- config-2.6.32-042stab049.6.x86_64  2012-02-13 07:18:08.000000000 +0100
-+++ config-2.6.32      2012-04-03 07:58:35.000000000 +0200
-@@ -103,7 +103,7 @@
- CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_CFS_BANDWIDTH=y
- CONFIG_CFS_CPULIMIT=y
--CONFIG_RT_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
- # CONFIG_USER_SCHED is not set
- CONFIG_CGROUP_SCHED=y
- CONFIG_VZ_FAIRSCHED=y
-@@ -207,7 +207,7 @@
+--- config-2.6.32-042stab076.7.x86_64  2013-04-29 23:21:00.000000000 +0200
++++ config-2.6.32      2013-05-07 06:40:45.000000000 +0200
+@@ -210,7 +210,7 @@
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
  CONFIG_MODULE_VERIFY_ELF=y
@@ -18,7 +9,21 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -935,7 +935,7 @@
+@@ -230,10 +230,10 @@
+ CONFIG_IOSCHED_CFQ=y
+ CONFIG_CFQ_GROUP_IOSCHED=y
+ # CONFIG_DEFAULT_AS is not set
+-# CONFIG_DEFAULT_DEADLINE is not set
+-CONFIG_DEFAULT_CFQ=y
++CONFIG_DEFAULT_DEADLINE=y
++# CONFIG_DEFAULT_CFQ is not set
+ # CONFIG_DEFAULT_NOOP is not set
+-CONFIG_DEFAULT_IOSCHED="cfq"
++CONFIG_DEFAULT_IOSCHED="deadline"
+ CONFIG_PREEMPT_NOTIFIERS=y
+ CONFIG_FREEZER=y
+ 
+@@ -946,7 +946,7 @@
  # CONFIG_ATM_BR2684_IPFILTER is not set
  CONFIG_STP=m
  CONFIG_GARP=m
@@ -27,7 +32,7 @@
  CONFIG_BRIDGE_IGMP_SNOOPING=y
  CONFIG_NET_DSA=y
  CONFIG_NET_DSA_TAG_DSA=y
-@@ -1344,10 +1344,10 @@
+@@ -1364,10 +1364,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -40,7 +45,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1425,7 +1425,7 @@
+@@ -1444,7 +1444,7 @@
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_EATA is not set
  # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -49,20 +54,21 @@
  CONFIG_SCSI_ISCI=m
  CONFIG_SCSI_IPS=m
  CONFIG_SCSI_INITIO=m
-@@ -1542,7 +1542,7 @@
+@@ -1562,7 +1562,7 @@
  # CONFIG_MULTICORE_RAID456 is not set
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
 -CONFIG_BLK_DEV_DM=m
 +CONFIG_BLK_DEV_DM=y
  CONFIG_DM_DEBUG=y
- CONFIG_DM_CRYPT=m
- CONFIG_DM_SNAPSHOT=m
-@@ -3121,6 +3121,11 @@
+ CONFIG_DM_BUFIO=m
+ CONFIG_DM_PERSISTENT_DATA=m
+@@ -3169,7 +3169,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
-+
+-CONFIG_LOGO_PSBM_CLUT224=y
++# CONFIG_LOGO_PSBM_CLUT224 is not set
 +#
 +# Bootsplash configuration
 +#
@@ -70,7 +76,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3719,7 +3724,9 @@
+@@ -3772,7 +3776,9 @@
  # CONFIG_SLICOSS is not set
  # CONFIG_VIDEO_GO7007 is not set
  # CONFIG_VIDEO_CX25821 is not set
@@ -81,7 +87,7 @@
  # CONFIG_W35UND is not set
  # CONFIG_PRISM2_USB is not set
  # CONFIG_ECHO is not set
-@@ -3851,7 +3858,11 @@
+@@ -3904,7 +3910,11 @@
  CONFIG_REISERFS_FS_XATTR=y
  CONFIG_REISERFS_FS_POSIX_ACL=y
  CONFIG_REISERFS_FS_SECURITY=y
@@ -94,7 +100,7 @@
  CONFIG_FS_POSIX_ACL=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
-@@ -3938,8 +3949,8 @@
+@@ -3992,8 +4002,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  CONFIG_ECRYPT_FS=m
@@ -105,7 +111,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4087,7 +4098,7 @@
+@@ -4140,7 +4150,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -114,7 +120,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4131,7 +4142,7 @@
+@@ -4184,7 +4194,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -123,7 +129,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4360,8 +4371,8 @@
+@@ -4415,8 +4425,8 @@
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_MPILIB=y