Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-09-05 09:52:24 +0200
committerMichal Marek <mmarek@suse.cz>2011-09-05 09:52:24 +0200
commit8a211c9645361190a2ac73318bd75dd2c8df7979 (patch)
tree7b2155df5c49a64fba1047a3d9a6148bf26a318f
parent94054c9188c313781025b7e14b01c2611c125ef3 (diff)
- Update to 3.1-rc5 from https://github.com/torvalds/linux.git.
-rw-r--r--config/i386/debug4
-rw-r--r--config/i386/default4
-rw-r--r--config/i386/desktop4
-rw-r--r--config/i386/pae4
-rw-r--r--config/i386/trace4
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ia64/debug3
-rw-r--r--config/ia64/default3
-rw-r--r--config/ia64/trace3
-rw-r--r--config/ia64/vanilla2
-rw-r--r--config/ppc/default3
-rw-r--r--config/ppc/ppc643
-rw-r--r--config/ppc/vanilla2
-rw-r--r--config/ppc64/debug3
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64/ppc643
-rw-r--r--config/ppc64/trace3
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/s390/s3902
-rw-r--r--config/s390/trace2
-rw-r--r--config/s390/vanilla2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/trace2
-rw-r--r--config/s390x/vanilla2
-rw-r--r--config/x86_64/debug4
-rw-r--r--config/x86_64/default4
-rw-r--r--config/x86_64/desktop4
-rw-r--r--config/x86_64/trace4
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--rpm/config.sh2
30 files changed, 30 insertions, 58 deletions
diff --git a/config/i386/debug b/config/i386/debug
index 6a01c717b1..4e1a86534b 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1641,7 +1641,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -5097,7 +5096,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/i386/default b/config/i386/default
index afee8ebcf4..8a9992cb50 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1641,7 +1641,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -5101,7 +5100,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/i386/desktop b/config/i386/desktop
index 268b6f255d..e611daecd6 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1617,7 +1617,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4944,7 +4943,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/i386/pae b/config/i386/pae
index a09ee6bd46..9592390af3 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1615,7 +1615,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4944,7 +4943,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/i386/trace b/config/i386/trace
index ec81bee20b..e28c018a26 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1615,7 +1615,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4944,7 +4943,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index ca87c77808..604c3c1e04 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/ia64/debug b/config/ia64/debug
index 5a7d76a45b..81dace0a86 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc4 Kernel Configuration
+# Linux/ia64 3.1.0-rc5 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1291,7 +1291,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/default b/config/ia64/default
index adeccdabdc..a684c816fb 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc4 Kernel Configuration
+# Linux/ia64 3.1.0-rc5 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1281,7 +1281,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/trace b/config/ia64/trace
index 12e14fc71e..a0796fb3bf 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc4 Kernel Configuration
+# Linux/ia64 3.1.0-rc5 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1281,7 +1281,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 7046c52176..3e7ae99f3b 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc3 Kernel Configuration
+# Linux/ia64 3.1.0-rc5 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
CONFIG_SPLIT_PACKAGE=y
diff --git a/config/ppc/default b/config/ppc/default
index 89522df1a1..11355d3ad9 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1224,7 +1224,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index 777a7e51f5..002ffb81fa 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index b594df72d7..41b9f0b40e 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
# CONFIG_PPC64 is not set
diff --git a/config/ppc64/debug b/config/ppc64/debug
index 63fb5a9928..a73ec0e042 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1252,7 +1252,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/default b/config/ppc64/default
index 0451b7d38c..9d6053ac06 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1242,7 +1242,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index df90d6f230..30cdccf91d 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 557334bd43..b2fae6b8ba 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc4 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 8386df8b2d..852d1317cb 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc5 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/s390/s390 b/config/s390/s390
index 0332c4d519..a03d528ff9 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc4 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390/trace b/config/s390/trace
index dc01e05916..71fb67c622 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc4 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390/vanilla b/config/s390/vanilla
index 4047a5f9a1..b4652144e6 100644
--- a/config/s390/vanilla
+++ b/config/s390/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/default b/config/s390x/default
index 6862d1211c..aca300dc0c 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc4 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/trace b/config/s390x/trace
index 61d725bde3..a45734639d 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc4 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index e5bef3b0ac..bc1394e898 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc5 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 7538335a78..e6fc3b5a8e 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc5 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1567,7 +1567,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4849,7 +4848,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/x86_64/default b/config/x86_64/default
index 1fad231792..8e888b5a23 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc5 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1557,7 +1557,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4860,7 +4859,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 43b1fce1e3..4f831f67a9 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc5 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1559,7 +1559,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4860,7 +4859,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 9f9d0c5da3..71512abd68 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc5 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1557,7 +1557,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -4860,7 +4859,6 @@ CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_MOUSE=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 77cfeffa06..f61782c427 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc3 Kernel Configuration
+# Linux/x86_64 3.1.0-rc5 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5822,4 +5822,3 @@ CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
CONFIG_LLIST=y
-CONFIG_INTEL_MID_PTI=m
diff --git a/rpm/config.sh b/rpm/config.sh
index d54ff9d8df..5f31d9329e 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.1-rc4
+SRCVERSION=3.1-rc5
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against