Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-07-06 18:58:01 -0400
committerJeff Mahoney <jeffm@suse.com>2011-07-06 18:58:01 -0400
commit56e99dabe82b4e0edb8c336cf9e74160fb86577a (patch)
tree42f57f7ee709ab89b7c316ab9f6b744777d1807d
parent4c2a76f809a4201c4ddd60ab3dda9679cfb27daf (diff)
- Update to 3.0-rc6.
- Eliminated 1 patch.
-rw-r--r--config/i386/debug3
-rw-r--r--config/i386/default3
-rw-r--r--config/i386/desktop3
-rw-r--r--config/i386/ec22
-rw-r--r--config/i386/pae3
-rw-r--r--config/i386/trace3
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/i386/xen3
-rw-r--r--config/ia64/debug7
-rw-r--r--config/ia64/default7
-rw-r--r--config/ia64/trace7
-rw-r--r--config/ia64/vanilla7
-rw-r--r--config/ppc/default4
-rw-r--r--config/ppc/ppc644
-rw-r--r--config/ppc/ps32
-rw-r--r--config/ppc/vanilla4
-rw-r--r--config/ppc64/debug4
-rw-r--r--config/ppc64/default4
-rw-r--r--config/ppc64/ppc644
-rw-r--r--config/ppc64/trace4
-rw-r--r--config/ppc64/vanilla4
-rw-r--r--config/s390/s3903
-rw-r--r--config/s390/trace3
-rw-r--r--config/s390/vanilla3
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/trace3
-rw-r--r--config/s390x/vanilla3
-rw-r--r--config/x86_64/debug3
-rw-r--r--config/x86_64/default3
-rw-r--r--config/x86_64/desktop3
-rw-r--r--config/x86_64/ec22
-rw-r--r--config/x86_64/trace3
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--config/x86_64/xen3
-rw-r--r--patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch104
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
37 files changed, 52 insertions, 178 deletions
diff --git a/config/i386/debug b/config/i386/debug
index 50105d5d2a..c3d14642b8 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1782,6 +1782,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_GENERIC_NCR5380=m
CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
CONFIG_SCSI_GENERIC_NCR53C400=y
diff --git a/config/i386/default b/config/i386/default
index 1cfdd4cb4b..33b79dfa16 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1777,6 +1777,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_GENERIC_NCR5380=m
CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
CONFIG_SCSI_GENERIC_NCR53C400=y
diff --git a/config/i386/desktop b/config/i386/desktop
index d488f00760..656b0117db 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1752,6 +1752,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/i386/ec2 b/config/i386/ec2
index 81e7bb7f09..c84bb0285a 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/pae b/config/i386/pae
index 883d2b4966..73e9ed5523 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1751,6 +1751,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/i386/trace b/config/i386/trace
index 6c7fbcea49..6ff0f7b09e 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1751,6 +1751,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 4b89066722..2766a32235 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1769,6 +1769,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_GENERIC_NCR5380=m
CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
CONFIG_SCSI_GENERIC_NCR53C400=y
diff --git a/config/i386/xen b/config/i386/xen
index 609722640a..c35491db33 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc5 Kernel Configuration
+# Linux/i386 3.0.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1601,6 +1601,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/ia64/debug b/config/ia64/debug
index ba3eeeda7f..8a277660e7 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc5 Kernel Configuration
+# Linux/ia64 3.0.0-rc6 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -4138,10 +4138,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMDBG is not set
-# CONFIG_COMEDI is not set
+# CONFIG_BRCMUTIL is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ia64/default b/config/ia64/default
index d88f93f812..528eeb1a51 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc5 Kernel Configuration
+# Linux/ia64 3.0.0-rc6 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -4120,10 +4120,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMDBG is not set
-# CONFIG_COMEDI is not set
+# CONFIG_BRCMUTIL is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ia64/trace b/config/ia64/trace
index 2935344833..8110850b16 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc5 Kernel Configuration
+# Linux/ia64 3.0.0-rc6 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
@@ -4126,10 +4126,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMDBG is not set
-# CONFIG_COMEDI is not set
+# CONFIG_BRCMUTIL is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index adb50c80d3..2a45c163de 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc5 Kernel Configuration
+# Linux/ia64 3.0.0-rc6 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
CONFIG_SPLIT_PACKAGE=y
@@ -4118,10 +4118,7 @@ CONFIG_USBIP_HOST=m
CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMDBG is not set
-# CONFIG_COMEDI is not set
+# CONFIG_BRCMUTIL is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc/default b/config/ppc/default
index a0d12603db..ed7234e916 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -4072,8 +4072,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index f340512f35..f15c4ef8ee 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4064,8 +4064,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc/ps3 b/config/ppc/ps3
index 750559a5bb..7a1298648f 100644
--- a/config/ppc/ps3
+++ b/config/ppc/ps3
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index cc621f75a4..a94af1089a 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -4077,8 +4077,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc64/debug b/config/ppc64/debug
index 7074dc5955..21f68a337e 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4061,8 +4061,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc64/default b/config/ppc64/default
index f1e13d351a..76eeab10ce 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4050,8 +4050,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index c3661f2531..9f9a5b748f 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4127,8 +4127,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 9031369dd1..6437d9635b 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4127,8 +4127,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index c973528ca8..0458464d9a 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc5 Kernel Configuration
+# Linux/powerpc 3.0.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -4046,8 +4046,6 @@ CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_COMEDI is not set
CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
diff --git a/config/s390/s390 b/config/s390/s390
index 3251e51f86..d1e95f3571 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1145,7 +1145,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/s390/trace b/config/s390/trace
index b0f2c4f390..bfbec31764 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1145,7 +1145,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/s390/vanilla b/config/s390/vanilla
index 966d41c7f6..2f963c2ed6 100644
--- a/config/s390/vanilla
+++ b/config/s390/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1174,7 +1174,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/s390x/default b/config/s390x/default
index 4a5812faaa..d3958ff1ee 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1160,7 +1160,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/s390x/trace b/config/s390x/trace
index b9c1a47e00..907abe3fc9 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1160,7 +1160,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index f3cb615d02..9716d75dc2 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc5 Kernel Configuration
+# Linux/s390 3.0.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1174,7 +1174,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_STAGING=y
CONFIG_ECHO=m
# CONFIG_BRCMUTIL is not set
-# CONFIG_COMEDI is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 688775363c..4bae40922e 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1706,6 +1706,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/x86_64/default b/config/x86_64/default
index cda27b2e40..54c6e0dc0f 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1696,6 +1696,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index b7fe291d56..d993c3101b 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1697,6 +1697,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 87e4cf7159..d0913e79ae 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/trace b/config/x86_64/trace
index dd5bf1724e..730f44f75c 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1696,6 +1696,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 3b9df4d64a..467d1ad687 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1686,6 +1686,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 34e3332015..60081972f5 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc5 Kernel Configuration
+# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1566,6 +1566,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
diff --git a/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch b/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch
deleted file mode 100644
index d6b2d1fb79..0000000000
--- a/patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 92f6fa09bd453ffe3351fa1f1377a1b7cfa911e6 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Sun, 5 Jun 2011 14:16:16 +0200
-Subject: TTY: ldisc, do not close until there are readers
-Git-commit: 92f6fa09bd453ffe3351fa1f1377a1b7cfa911e6
-Patch-mainline: 3.0-rc6
-References: bnc#698247 bnc#693374
-
-We restored tty_ldisc_wait_idle in 100eeae2c5c (TTY: restore
-tty_ldisc_wait_idle). We used it in the ldisc changing path to fix the
-case where there are tasks in n_tty_read waiting for data and somebody
-tries to change ldisc.
-
-Similar to the case above, there may be also tasks waiting in
-n_tty_read while hangup is performed. As 65b770468e98 (tty-ldisc: turn
-ldisc user count into a proper refcount) removed the wait-until-idle
-from all paths, hangup path won't wait for them to disappear either
-now. So add it back even to the hangup path.
-
-There is a difference, we need uninterruptible sleep as there is
-obviously HUP signal pending. So tty_ldisc_wait_idle now sleeps
-without possibility to be interrupted. This is what original
-tty_ldisc_wait_idle did. After the wait idle reintroduction
-(100eeae2c5c), we have had interruptible sleeps for the ldisc changing
-path. But as there is a 5s timeout anyway, we don't allow it to be
-interrupted from now on. It's not worth the added complexity of
-deciding what kind of sleep we want.
-
-Before 65b770468e98 tty_ldisc_release was called also from
-tty_ldisc_release. It is called from tty_release, so I don't think we
-need to restore that one.
-
-This is nicely reproducible after constifying the timing when
-drivers/tty/n_tty.c is patched as follows ("TTY: ntty, add one more
-sanity check" patch is needed to actually see it explode):
-%% -1548,6 +1549,7 @@ static int n_tty_open(struct tty_struct *tty)
-
- /* These are ugly. Currently a malloc failure here can panic */
- if (!tty->read_buf) {
-+ msleep(100);
- tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
- if (!tty->read_buf)
- return -ENOMEM;
-%% -1785,6 +1788,7 @@ do_it_again:
- break;
- }
- timeout = schedule_timeout(timeout);
-+ msleep(20);
- continue;
- }
- __set_current_state(TASK_RUNNING);
-===== With a process: =====
- while (1) {
- int fd = open(argv[1], O_RDWR);
- read(fd, buf, sizeof(buf));
- close(fd);
- }
-===== and its child: =====
- setsid();
- while (1) {
- int fd = open(tty, O_RDWR|O_NOCTTY);
- ioctl(fd, TIOCSCTTY, 1);
- vhangup();
- close(fd);
- usleep(100 * (10 + random() % 1000));
- }
-===== EOF =====
-
-References: https://bugzilla.novell.com/show_bug.cgi?id=693374
-References: https://bugzilla.novell.com/show_bug.cgi?id=694509
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: stable <stable@kernel.org> [32, 33, 34, 39]
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/tty/tty_ldisc.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index 5d01d32..ef925d5 100644
---- a/drivers/tty/tty_ldisc.c
-+++ b/drivers/tty/tty_ldisc.c
-@@ -555,7 +555,7 @@ static void tty_ldisc_flush_works(struct tty_struct *tty)
- static int tty_ldisc_wait_idle(struct tty_struct *tty)
- {
- int ret;
-- ret = wait_event_interruptible_timeout(tty_ldisc_idle,
-+ ret = wait_event_timeout(tty_ldisc_idle,
- atomic_read(&tty->ldisc->users) == 1, 5 * HZ);
- if (ret < 0)
- return ret;
-@@ -763,6 +763,8 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
- if (IS_ERR(ld))
- return -1;
-
-+ WARN_ON_ONCE(tty_ldisc_wait_idle(tty));
-+
- tty_ldisc_close(tty, tty->ldisc);
- tty_ldisc_put(tty->ldisc);
- tty->ldisc = NULL;
---
-1.7.6
-
diff --git a/rpm/config.sh b/rpm/config.sh
index df649d70c9..ba754bca8d 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.0-rc5
+SRCVERSION=3.0-rc6
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
diff --git a/series.conf b/series.conf
index 4c074db9fb..44460ac316 100644
--- a/series.conf
+++ b/series.conf
@@ -430,7 +430,6 @@
########################################################
# Char / serial
########################################################
- patches.fixes/tty-ldisc-do-not-close-until-there-are-readers.patch
########################################################
# Other driver fixes