From 59f71fbb124225482512200a2c29c8255451a324 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 8 Oct 2009 00:14:15 +0000 Subject: [PATCH] Add stable release 2.6.31.3 svn path=/dists/trunk/linux-2.6/; revision=14344 --- debian/changelog | 1 + .../patches/bugfix/all/stable/2.6.31.3.patch | 24 +++++++++++++++++++ debian/patches/series/base | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/bugfix/all/stable/2.6.31.3.patch diff --git a/debian/changelog b/debian/changelog index 1de905bf0..20d76920b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux-2.6 (2.6.31-1~experimental.2) UNRELEASED; urgency=low * Improve package descriptions - Clarify the differences between i386 flavours (Closes: #414690) - Simplify wording of the description template + * Add stable release 2.6.31.3 [ maximilian attems ] * Add stable release 2.6.31.2 (Closes: #522828) diff --git a/debian/patches/bugfix/all/stable/2.6.31.3.patch b/debian/patches/bugfix/all/stable/2.6.31.3.patch new file mode 100644 index 000000000..2673be0e8 --- /dev/null +++ b/debian/patches/bugfix/all/stable/2.6.31.3.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile b/Makefile +index d3a69fd..0138557 100644 +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/debian/patches/series/base b/debian/patches/series/base index 548d7fe66..114bd3548 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -41,3 +41,4 @@ - bugfix/x86/fix-i8xx-agp-flush.patch + bugfix/all/stable/2.6.31.2.patch + bugfix/all/drivers-net-sfc-fix-initial-link-state.patch ++ bugfix/all/stable/2.6.31.3.patch