Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-10-07 15:27:25 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-07 15:27:25 -0700
commita6f42d11c9c21d4bcac911d3cf369c8a041bea0c (patch)
treef935dbbd2f82413fd0f4d34005067d3a18340e99
parent834aa041fd03610f6d24c45f8c3c86156e14a6d4 (diff)
- patches.kernel.org/patch-2.6.31.2-3: Linux 2.6.31.3.rpm-2.6.31.3-1
- major tty bugfix
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.kernel.org/patch-2.6.31.2-340
-rw-r--r--series.conf1
3 files changed, 47 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 1b00656756..6685d24a8c 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Oct 8 00:27:18 CEST 2009 - gregkh@suse.de
+
+- patches.kernel.org/patch-2.6.31.2-3: Linux 2.6.31.3.
+ - major tty bugfix
+
+-------------------------------------------------------------------
Wed Oct 7 15:20:25 CEST 2009 - tiwai@suse.de
- patches.drivers/alsa-hda-alc268-automic-fix: ALSA: hda -
diff --git a/patches.kernel.org/patch-2.6.31.2-3 b/patches.kernel.org/patch-2.6.31.2-3
new file mode 100644
index 0000000000..4da0d922cb
--- /dev/null
+++ b/patches.kernel.org/patch-2.6.31.2-3
@@ -0,0 +1,40 @@
+Subject: Linux 2.6.31.3
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/Makefile b/Makefile
+index d3a69fd..0138557 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 31
+-EXTRAVERSION = .2
++EXTRAVERSION = .3
+ NAME = Man-Eating Seals of Antiquity
+
+ # *DOCUMENTATION*
+diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
+index 549bd0f..fa4ce67 100644
+--- a/drivers/char/tty_port.c
++++ b/drivers/char/tty_port.c
+@@ -99,7 +99,7 @@ EXPORT_SYMBOL(tty_port_tty_set);
+ static void tty_port_shutdown(struct tty_port *port)
+ {
+ if (port->ops->shutdown &&
+- test_and_clear_bit(ASYNC_INITIALIZED, &port->flags))
++ test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
+ port->ops->shutdown(port);
+
+ }
+@@ -309,7 +309,7 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
+ port->ops->drop(port);
+ return 0;
+ }
+- set_bit(ASYNC_CLOSING, &port->flags);
++ set_bit(ASYNCB_CLOSING, &port->flags);
+ tty->closing = 1;
+ spin_unlock_irqrestore(&port->lock, flags);
+ /* Don't block on a stalled port, just pull the chain */
diff --git a/series.conf b/series.conf
index 7fb92d89a7..d210d4ab21 100644
--- a/series.conf
+++ b/series.conf
@@ -29,6 +29,7 @@
########################################################
patches.kernel.org/patch-2.6.31.1
patches.kernel.org/patch-2.6.31.1-2
+ patches.kernel.org/patch-2.6.31.2-3
########################################################
# Build fixes that apply to the vanilla kernel too.