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 5c7ed946d0dda5423f7ff3df3ed2debec235e9cd..b39650877db2d762ac57cf6a5c18afe86434e86e 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab074.10.x86_64 2013-03-04 18:44:35.000000000 +0100
-+++ config-2.6.32      2013-03-08 11:01:45.000000000 +0100
+--- 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
@@ -9,17 +9,29 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -946,8 +946,8 @@
+@@ -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
 -CONFIG_BRIDGE=m
--CONFIG_BRIDGE_IGMP_SNOOPING=y
 +CONFIG_BRIDGE=y
-+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
+ CONFIG_BRIDGE_IGMP_SNOOPING=y
  CONFIG_NET_DSA=y
  CONFIG_NET_DSA_TAG_DSA=y
- CONFIG_NET_DSA_TAG_EDSA=y
 @@ -1364,10 +1364,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)