Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-08-29 09:25:47 -0400
committerJeff Mahoney <jeffm@suse.com>2011-08-29 09:25:47 -0400
commit68e08b1c8cc38ef224901c48fcf309f9202f425a (patch)
tree3d66275db11547ffae9ded08681e6e6d8ab3ef16
parente975e4bd16a45bac8417d1a113267189dd6ed2fc (diff)
- Update to 3.1-rc4.
-rw-r--r--config/i386/debug2
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/desktop2
-rw-r--r--config/i386/pae2
-rw-r--r--config/i386/trace2
-rw-r--r--config/ia64/debug3
-rw-r--r--config/ia64/default3
-rw-r--r--config/ia64/trace3
-rw-r--r--config/ppc/default3
-rw-r--r--config/ppc/ppc643
-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/s390/s3902
-rw-r--r--config/s390/trace2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/trace2
-rw-r--r--config/x86_64/debug2
-rw-r--r--config/x86_64/default2
-rw-r--r--config/x86_64/desktop2
-rw-r--r--config/x86_64/trace2
-rw-r--r--config/x86_64/vanilla1
-rw-r--r--patches.fixes/bridge-module-get-put.patch21
-rw-r--r--rpm/config.sh2
25 files changed, 40 insertions, 37 deletions
diff --git a/config/i386/debug b/config/i386/debug
index 5d54ac6bc8..6a01c717b1 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/default b/config/i386/default
index b815ea9cbf..afee8ebcf4 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/desktop b/config/i386/desktop
index 35365d8964..268b6f255d 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/pae b/config/i386/pae
index b7bc66f28f..a09ee6bd46 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/trace b/config/i386/trace
index 0d0fbb8170..ec81bee20b 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc3 Kernel Configuration
+# Linux/i386 3.1.0-rc4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/ia64/debug b/config/ia64/debug
index 616b103dc2..5a7d76a45b 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc3 Kernel Configuration
+# Linux/ia64 3.1.0-rc4 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1291,6 +1291,7 @@ 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 ca857e1b66..adeccdabdc 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc3 Kernel Configuration
+# Linux/ia64 3.1.0-rc4 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1281,6 +1281,7 @@ 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 6041114f4a..12e14fc71e 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/ia64 3.1.0-rc3 Kernel Configuration
+# Linux/ia64 3.1.0-rc4 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -1281,6 +1281,7 @@ 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/ppc/default b/config/ppc/default
index 84cdc370a6..89522df1a1 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1224,6 +1224,7 @@ 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 88377c9e40..777a7e51f5 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,6 +1288,7 @@ 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/debug b/config/ppc64/debug
index b8d9d9d197..63fb5a9928 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1252,6 +1252,7 @@ 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 ce4418051d..0451b7d38c 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1242,6 +1242,7 @@ 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 9bb596432a..df90d6f230 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,6 +1288,7 @@ 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 6526390ce1..557334bd43 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.1.0-rc3 Kernel Configuration
+# Linux/powerpc 3.1.0-rc4 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1288,6 +1288,7 @@ 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/s390/s390 b/config/s390/s390
index 5de3d2e251..0332c4d519 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc4 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390/trace b/config/s390/trace
index a35100c220..dc01e05916 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc4 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/default b/config/s390x/default
index 5aa9178969..6862d1211c 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc4 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/trace b/config/s390x/trace
index 9faff12e2a..61d725bde3 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.1.0-rc3 Kernel Configuration
+# Linux/s390 3.1.0-rc4 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 1e13fe2e36..7538335a78 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-rc3 Kernel Configuration
+# Linux/x86_64 3.1.0-rc4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index 16d4ef487b..1fad231792 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-rc3 Kernel Configuration
+# Linux/x86_64 3.1.0-rc4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 65204d717b..43b1fce1e3 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-rc3 Kernel Configuration
+# Linux/x86_64 3.1.0-rc4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/trace b/config/x86_64/trace
index eda3c430ce..9f9d0c5da3 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-rc3 Kernel Configuration
+# Linux/x86_64 3.1.0-rc4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 067664d361..77cfeffa06 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -5822,3 +5822,4 @@ CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
CONFIG_LLIST=y
+CONFIG_INTEL_MID_PTI=m
diff --git a/patches.fixes/bridge-module-get-put.patch b/patches.fixes/bridge-module-get-put.patch
index 9eed8be423..0933c257fe 100644
--- a/patches.fixes/bridge-module-get-put.patch
+++ b/patches.fixes/bridge-module-get-put.patch
@@ -13,15 +13,7 @@ bridges.
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
-@@ -230,6 +230,7 @@ static struct net_bridge_port *new_nbp(s
-
- int br_add_bridge(struct net *net, const char *name)
- {
-+ int ret;
- struct net_device *dev;
-
- dev = alloc_netdev(sizeof(struct net_bridge), name,
-@@ -238,9 +239,17 @@ int br_add_bridge(struct net *net, const
+@@ -238,11 +239,18 @@ int br_add_bridge(struct net *net, const
if (!dev)
return -ENOMEM;
@@ -32,14 +24,15 @@ bridges.
+
dev_net_set(dev, net);
-- return register_netdev(dev);
-+ ret = register_netdev(dev);
-+ if (ret)
+ res = register_netdev(dev);
+- if (res)
++ if (res) {
+ free_netdev(dev);
+ module_put(THIS_MODULE);
-+ return ret;
++ }
+ return res;
}
- int br_del_bridge(struct net *net, const char *name)
@@ -267,6 +276,8 @@ int br_del_bridge(struct net *net, const
del_br(netdev_priv(dev), NULL);
diff --git a/rpm/config.sh b/rpm/config.sh
index 129c862993..d54ff9d8df 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.1-rc3
+SRCVERSION=3.1-rc4
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against